修改用户信息限制管理员数量

src/main/java/cn/chnmuseum/party/web/controller/TInteractionController.java

@@ -2,11 +2,15 @@ package cn.chnmuseum.party.web.controller;
 
 import cn.chnmuseum.party.auth.SHA256PasswordEncryptionService;
 import cn.chnmuseum.party.auth.SecureRandomSaltService;
+import cn.chnmuseum.party.auth.util.AESUtils;
+import cn.chnmuseum.party.common.enums.AuditOperationEnum;
 import cn.chnmuseum.party.common.log.MethodLog;
 import cn.chnmuseum.party.common.log.OperModule;
 import cn.chnmuseum.party.common.log.OperType;
 import cn.chnmuseum.party.common.util.DateUtil80;
+import cn.chnmuseum.party.model.Role;
 import cn.chnmuseum.party.model.TUser;
+import cn.chnmuseum.party.service.RoleService;
 import cn.chnmuseum.party.service.impl.TUserServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -37,10 +41,12 @@ import org.springframework.stereotype.Controller;
 
 import javax.annotation.Resource;
 import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <pre>
@@ -62,6 +68,9 @@ public class TInteractionController extends BaseController {
     @Resource
     private TUserServiceImpl userService;
 
+    @Resource
+    private RoleService roleService;
+
 
     @PostMapping("/add")
     @RequiresAuthentication  //@RequiresPermissions("/interaction/add")
@@ -73,6 +82,46 @@ public class TInteractionController extends BaseController {
         boolean result = false;
         try {
             Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
+            // 验证互动审核员账号
+            if (StringUtils.isBlank(tInteraction.getName()) || StringUtils.isBlank(tInteraction.getPassword())) {
+                resultMap.put("resultCode", "400");
+                resultMap.put("message", "互动管理员账号或密码不能为空");
+                return resultMap;
+            }
+            TUser tUser = userService.selectByUsername(tInteraction.getName());
+            if (tUser == null) {
+                resultMap.put("resultCode", "400");
+                resultMap.put("message", "用户名不正确！");
+                return resultMap;
+            }
+            if (AuditOperationEnum.DISABLE.name().equals(user.getStatus())) {
+                resultMap.put("resultCode", "400");
+                resultMap.put("message", "此帐号已禁用，请联系管理员！");
+                return resultMap;
+            }
+            if (user.getPermanent() != null && !user.getPermanent()) {
+                if (user.getEffectiveDate() != null && user.getEffectiveDate().isAfter(LocalDate.now()) || user.getExiredDate() != null && user.getExiredDate().isBefore(LocalDate.now())) {
+                    resultMap.put("resultCode", "400");
+                    resultMap.put("message", "此帐号已失效，请联系管理员！");
+                    return resultMap;
+                }
+            }
+            //密码解密
+            String s = AESUtils.aesDecrypt(tInteraction.getPassword());
+            byte[] salt = user.getPasswordSalt();
+            String s1 = new String(SHA256PasswordEncryptionService.createPasswordHash(s, salt));
+            if (!s1.equals(new String(user.getPasswordHash()))) {
+                resultMap.put("resultCode", "400");
+                resultMap.put("message", "密码不正确！");
+                return resultMap;
+            }
+            List<Role> roles = roleService.selectRoleByUserId(user.getId());
+            List<String> roleIds = roles.stream().map(Role::getId).collect(Collectors.toList());
+            if (!roleIds.contains("17")) {
+                resultMap.put("resultCode", "400");
+                resultMap.put("message", "所填写账号非互动审核员！");
+                return resultMap;
+            }
             tInteraction.setUserId(user.getId());
             tInteraction.setCreateTime(LocalDateTime.now());
             result = tInteractionService.save(tInteraction);

src/main/java/cn/chnmuseum/party/web/controller/TUserController.java

@@ -426,9 +426,14 @@ public class TUserController extends BaseController {
                         resultMap.put("message", "机构已存在一个互动审核员！");
                         return resultMap;
                     }
-                    if (StringUtils.isNotBlank(user.getRoleId()) && !CollectionUtils.isEmpty(user.getRoleList())) {
+                    if (!CollectionUtils.isEmpty(user.getRoleList())) {
                         user.getRoleList().remove(ROLE_HDSHY);
                         user.getRoleList().remove(ROLE_PTGLY);
+                    }
+                    if (StringUtils.isNotBlank(user.getRoleId()) ) {
+                        if (CollectionUtils.isEmpty(user.getRoleList())) {
+                            user.setRoleList(new ArrayList<String>());
+                        }
                         user.getRoleList().add(user.getRoleId());
                     }
                 }