diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
index d9cc6437..f2ba5aaf 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java
@@ -198,7 +198,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 				permissionSet.add(po.getPerms());
 			}
 		}
-		log.info("-------通过数据库读取用户拥有的权限Perms------username： "+ username+",Perms size: "+ (permissionSet==null?0:permissionSet.size()) );
+		log.info("-------通过数据库读取用户拥有的权限Perms------username： "+ username+",Perms size: "+ (permissionSet.isEmpty()?0:permissionSet.size()) );
 		return permissionSet;
 	}
 
@@ -215,9 +215,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		}
 
 		//多部门支持in查询
-		List<SysDepart> list = sysDepartMapper.queryUserDeparts(user.getId());
-		List<String> sysMultiOrgCode = new ArrayList<String>();
-		if(list==null || list.size()==0) {
+
+		List<SysDepart> list = null;
+		if (user!=null) {
+			list = sysDepartMapper.queryUserDeparts(user.getId());
+		}
+		List<String> sysMultiOrgCode = new ArrayList<>();
+		if(list==null || list.isEmpty()) {
 			//当前用户无部门
 			//sysMultiOrgCode.add("0");
 		}else if(list.size()==1) {
@@ -248,7 +252,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	public Map<String, String> getDepNamesByUserIds(List<String> userIds) {
 		List<SysUserDepNameVo> userDeplist = this.baseMapper.getDepNamesByUserIds(userIds);
 
-		Map<String, String> res = new HashMap<String, String>();
+		Map<String, String> res = new HashMap<>();
 		userDeplist.forEach(item -> {
 					if (res.get(item.getUserId()) == null) {
 						res.put(item.getUserId(), item.getDepartName());
@@ -269,7 +273,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	public Map<String, String> getRoleNamesByUserIds(List<String> userIds) {
 		List<SysUserRoleNameVo> userRolelist = this.baseMapper.getRoleNamesByUserIds(userIds);
 
-		Map<String, String> res = new HashMap<String, String>();
+		Map<String, String> res = new HashMap<>();
 		userRolelist.forEach(item -> {
 					if (res.get(item.getUserId()) == null) {
 						res.put(item.getUserId(), item.getRoleName());
@@ -368,7 +372,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	 */
 	@Override
 	public Result<?> checkUserIsEffective(SysUser sysUser) {
-		Result<?> result = new Result<Object>();
+		Result<?> result = new Result<>();
 		//情况1：根据用户信息查询，该用户不存在
 		if (sysUser == null) {
 			baseCommonService.addLog("用户登录失败，用户不存在！", CommonConstant.LOG_TYPE_1, null);