diff --git a/src/main/java/com/lq/cms/service/impl/SysLogServiceImpl.java b/src/main/java/com/lq/cms/service/impl/SysLogServiceImpl.java
index 5e3e398..c5a807a 100755
--- a/src/main/java/com/lq/cms/service/impl/SysLogServiceImpl.java
+++ b/src/main/java/com/lq/cms/service/impl/SysLogServiceImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
  * Created by qi_liang on 2018/6/21.
  */
 @Service
-public class SysLogServiceImpl extends BaseServiceImpl<SysLog> implements SysLogService {
+public class SysLogServiceImpl  implements SysLogService {
 
     @Autowired
     private SysLogDao sysLogDao;
diff --git a/src/main/java/com/lq/cms/service/impl/SysPermissionServiceImpl.java b/src/main/java/com/lq/cms/service/impl/SysPermissionServiceImpl.java
index 6310155..daef001 100644
--- a/src/main/java/com/lq/cms/service/impl/SysPermissionServiceImpl.java
+++ b/src/main/java/com/lq/cms/service/impl/SysPermissionServiceImpl.java
@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @Author: qi
@@ -26,7 +27,7 @@ import java.util.List;
  * @Date: Create in 12:06 AM 2019/7/23
  */
 @Service
-public class SysPermissionServiceImpl extends BaseServiceImpl<SysPermission> implements SysPermissionService{
+public class SysPermissionServiceImpl  implements SysPermissionService{
 
     @Autowired
     private SysPermissionDao sysPermissionDao;
@@ -39,20 +40,23 @@ public class SysPermissionServiceImpl extends BaseServiceImpl<SysPermission> imp
     public List<SysPermissionVo> findListPage(SysPermissionVo vo) {
         List<SysPermissionVo> sysPermissionVos = sysPermissionDao.findListPage(vo);
         sysPermissionVos.forEach(sysPermissionVo1->{
-            if (sysPermissionVo1.getSysResourceId()!=null) {
-                SysResource sysResource = sysResourceDao.findOne(sysPermissionVo1.getSysResourceId());
+            Optional<Long> sysResourceIdOptional = Optional.of(sysPermissionVo1.getSysResourceId());
+            if (sysResourceIdOptional.isPresent()) {
+                SysResource sysResource = sysResourceDao.findOne(sysResourceIdOptional.get());
                 if (sysResource!=null) {
                     sysPermissionVo1.setSysResourceName(sysResource.getMenuName());
                 }
             }
-            if (sysPermissionVo1.getCreateUserId()!=null) {
-                SysUser createUser = sysUserDao.findOne(sysPermissionVo1.getCreateUserId());
+            Optional<Long> createUserIdOptional = Optional.of(sysPermissionVo1.getCreateUserId());
+            if (createUserIdOptional.isPresent()) {
+                SysUser createUser = sysUserDao.findOne(createUserIdOptional.get());
                 if (createUser!=null) {
                     sysPermissionVo1.setCreateUserName(createUser.getLoginName());
                 }
             }
-            if (sysPermissionVo1.getUpdateUserId()!=null) {
-                SysUser updateUser = sysUserDao.findOne(sysPermissionVo1.getUpdateUserId());
+            Optional<Long> updateUserIdOptional = Optional.of(sysPermissionVo1.getUpdateUserId());
+            if (updateUserIdOptional.isPresent()) {
+                SysUser updateUser = sysUserDao.findOne(updateUserIdOptional.get());
                 if (updateUser!=null) {
                     sysPermissionVo1.setUpdateUserName(updateUser.getLoginName());
                 }
diff --git a/src/main/java/com/lq/cms/service/impl/SysResourceServiceImpl.java b/src/main/java/com/lq/cms/service/impl/SysResourceServiceImpl.java
index 2770678..4fc6597 100755
--- a/src/main/java/com/lq/cms/service/impl/SysResourceServiceImpl.java
+++ b/src/main/java/com/lq/cms/service/impl/SysResourceServiceImpl.java
@@ -52,13 +52,13 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResource> impleme
 
     @Override
     public List<MenusComposite> findMenusListBySysUserId(Long sysUserId, String contextPath) {
-        Map<String,Object> map=new HashMap(3);
+         Map<String,Object> map=new HashMap(3);
         map.put("userId",sysUserId);
         map.put("parentId", Constant.TOP_PARENT_ID);
         map.put("permissionId", PermissionTyepEnum.SELECT.getValue());
         List<SysResource> menusItmeList=sysResourceDao.findMenu(map);
         List<MenusComposite> list=new ArrayList<>();
-        for (SysResource sysResource:menusItmeList){
+        menusItmeList.forEach(sysResource->{
             MenusItem menusItem=new MenusItem();
             menusItem.setMenuname(sysResource.getMenuName());
             menusItem.setIcon(sysResource.getMenuIco());
@@ -74,7 +74,9 @@ public class SysResourceServiceImpl extends BaseServiceImpl<SysResource> impleme
                 menusItem.add(menus);
             }
             list.add(menusItem);
-        }
+
+        });
+
         return list;
     }
 
diff --git a/src/main/java/com/lq/cms/service/impl/SysRoleResourcePermissionServiceImpl.java b/src/main/java/com/lq/cms/service/impl/SysRoleResourcePermissionServiceImpl.java
index 744544b..49aa6d0 100755
--- a/src/main/java/com/lq/cms/service/impl/SysRoleResourcePermissionServiceImpl.java
+++ b/src/main/java/com/lq/cms/service/impl/SysRoleResourcePermissionServiceImpl.java
@@ -27,7 +27,7 @@ import java.util.*;
  * Created by qi_liang on 2018/6/21.
  */
 @Service
-public class SysRoleResourcePermissionServiceImpl extends BaseServiceImpl<SysRoleResourcePermission> implements SysRoleResourcePermissionService {
+public class SysRoleResourcePermissionServiceImpl  implements SysRoleResourcePermissionService {
 
     public static final String RESOURCE_SYMBOL = "_";
 
@@ -128,10 +128,10 @@ public class SysRoleResourcePermissionServiceImpl extends BaseServiceImpl<SysRol
     public List<PermissionVo> findAllPermissonVo() {
         List<PermissionVo> list = new ArrayList<>();
         List<SysResource> sysResourceList =  sysResourceDao.findAll();
-        Iterator iterator = sysResourceList.iterator();
+        Iterator<SysResource> iterator = sysResourceList.iterator();
         PermissionTyepEnum[] tyepEnums = PermissionTyepEnum.values();
         while (iterator.hasNext()){
-            SysResource sysResource = (SysResource) iterator.next();
+            SysResource sysResource = iterator.next();
             if (sysResource!=null){
                 for (PermissionTyepEnum permissionTyepEnum:tyepEnums){
                     PermissionVo permissionVo = new PermissionVo();
@@ -151,19 +151,21 @@ public class SysRoleResourcePermissionServiceImpl extends BaseServiceImpl<SysRol
      *内部方法，用于判断角色是否有权限
      */
     private boolean isCheck(Long resourceId,Long permissionId,Long roleId){
-        SysRoleResourcePermission roleResourcePermission=sysRoleResourcePermissionDao.getByResourceIdAndPermissionIdAndRoleId(resourceId,permissionId,roleId);
-        if (roleResourcePermission!=null&&StatusTypeEnum.STATUS_ACTIVITY_YES.getValue().equals(roleResourcePermission.getStatus())){
-            return true;
-        }else{
-            return false;
+        boolean result = false;
+        if (permissionId!=null&&roleId!=null){
+            SysRoleResourcePermission roleResourcePermission=sysRoleResourcePermissionDao.getByResourceIdAndPermissionIdAndRoleId(resourceId,permissionId,roleId);
+            if (roleResourcePermission!=null&&StatusTypeEnum.STATUS_ACTIVITY_YES.getValue().equals(roleResourcePermission.getStatus())){
+                result = true;
+            }
         }
+        return result;
     }
 
     /**
      *内部方法，拼接资源和权限ID
      */
     private Map<String,Object> getAttributes(Long resourceId,Long permissionId){
-        Map<String,Object> map=new HashMap<>();
+        Map<String,Object> map=new HashMap<>(1);
         map.put(PERMISSIONID_KEY,resourceId+RESOURCE_SYMBOL+permissionId);
         return map;
     }
diff --git a/src/main/java/com/lq/cms/service/impl/SysRoleServiceImpl.java b/src/main/java/com/lq/cms/service/impl/SysRoleServiceImpl.java
index 1505379..3a8ed0e 100755
--- a/src/main/java/com/lq/cms/service/impl/SysRoleServiceImpl.java
+++ b/src/main/java/com/lq/cms/service/impl/SysRoleServiceImpl.java
@@ -22,7 +22,7 @@ import java.util.Map;
  * Created by qi_liang on 2018/6/21.
  */
 @Service
-public class SysRoleServiceImpl extends BaseServiceImpl<SysRole> implements SysRoleService {
+public class SysRoleServiceImpl  implements SysRoleService {
 
     @Autowired
     private SysRoleDao sysRoleDao;
diff --git a/src/main/java/com/lq/cms/service/impl/SysUserRoleServiceImpl.java b/src/main/java/com/lq/cms/service/impl/SysUserRoleServiceImpl.java
index 7b7fab1..5a3c0f5 100755
--- a/src/main/java/com/lq/cms/service/impl/SysUserRoleServiceImpl.java
+++ b/src/main/java/com/lq/cms/service/impl/SysUserRoleServiceImpl.java
@@ -19,7 +19,7 @@ import java.util.Map;
  * Created by qi_liang on 2018/6/21.
  */
 @Service
-public class SysUserRoleServiceImpl extends BaseServiceImpl<SysUserRole> implements SysUserRoleService {
+public class SysUserRoleServiceImpl  implements SysUserRoleService {
 
     @Autowired
     private SysUserRoleDao sysUserRoleDao;
diff --git a/src/main/java/com/lq/cms/service/impl/SysUserServiceImpl.java b/src/main/java/com/lq/cms/service/impl/SysUserServiceImpl.java
index 8d2c5fa..872eade 100755
--- a/src/main/java/com/lq/cms/service/impl/SysUserServiceImpl.java
+++ b/src/main/java/com/lq/cms/service/impl/SysUserServiceImpl.java
@@ -18,7 +18,7 @@ import java.util.List;
  * Created by qi_liang on 2018/6/21.
  */
 @Service
-public class SysUserServiceImpl extends BaseServiceImpl<SysUser> implements SysUserService {
+public class SysUserServiceImpl implements SysUserService {
 
     @Autowired
     private SysUserDao sysUserDao;
diff --git a/src/main/java/com/lq/cms/service/impl/WechatInfoServiceImpl.java b/src/main/java/com/lq/cms/service/impl/WechatInfoServiceImpl.java
index 506591a..ff1277b 100755
--- a/src/main/java/com/lq/cms/service/impl/WechatInfoServiceImpl.java
+++ b/src/main/java/com/lq/cms/service/impl/WechatInfoServiceImpl.java
@@ -15,7 +15,7 @@ import java.util.List;
  * Created by qi_liang on 2018/6/21.
  */
 @Service
-public class WechatInfoServiceImpl extends BaseServiceImpl<WechatInfo> implements WechatInfoService {
+public class WechatInfoServiceImpl implements WechatInfoService {
 
     @Autowired
     private WechatInfoDao wechatInfoDao;