ariesy Redission增加集群配置

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java

@@ -8,6 +8,7 @@ import javax.annotation.Resource;
 import com.dxhy.common.util.StringHelper;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -351,6 +352,20 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             user.setUserOrg(userOrgEntity);
             user.setUserBusiness(businessList);
             user.setCompanyCodes(companyEntitys);
+            List<UserModel> userModels = setUserModels(userEntity, userId);
+            user.setUserModels(userModels);
+            // 刷新菜单缓存处理
+            this.setMetnuRedis(userEntity.getUserId());
+            user.setEmailCodes(emailCodes);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return user;
+    }
+
+    @NotNull
+    private List<UserModel> setUserModels(SysUserEntity userEntity, long userId) {
         //            user.setUserModels(this.getUserCompanyList(userEntity.getCompany()));
         List<SysDeptEntity> deptEntities = sysUserOrgService.queryOrgCodes(userId);
         List<UserModel> userModels = new ArrayList<>();
@@ -379,17 +394,18 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
             userModel.setDeptId(String.valueOf(entity.getDeptId()));
             userModels.add(userModel);
         }
-
-            log.info("userModels={}",userModels);
-            user.setUserModels(userModels);
-            // 刷新菜单缓存处理
-            this.setMetnuRedis(userEntity.getUserId());
-            user.setEmailCodes(emailCodes);
-        } catch (Exception e) {
-            e.printStackTrace();
+        if(userModels.stream().noneMatch(e -> userEntity.getUserId().equals(e.getUserId()) && userEntity.getDeptId().equals(e.getDeptId()))) {
+            //当前登录用户手动增加一个admin
+            UserModel userModel = new UserModel();
+            userModel.setUserId("10086");
+            userModel.setLoginname("admin");
+            userModel.setUsername("admin");
+            userModel.setDeptId(String.valueOf(userEntity.getDeptId()));
+            userModels.add(userModel);
         }
 
-        return user;
+        log.info("userModels={}",userModels);
+        return userModels;
     }
 
     private List<UserModel> getUserCompanyList(String company) {