解锁操作不需要审批

backend/src/main/java/com/jiayue/ssi/controller/SysApproveController.java

@@ -224,39 +224,39 @@ public class SysApproveController {
                                 }
                                 record.setParameterContent(parameterContent.toString());
                             }
-                            else if (record.getOperation().equals(String.valueOf(ApproveOperaterEnum.RELOCK.getCode()))){
-                                // 敏感数据先解密
-                                String idcard = SM2CryptUtils.decrypt(record.getIdcard(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String nickname = SM2CryptUtils.decrypt(record.getNickname(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String mailbox = SM2CryptUtils.decrypt(record.getMailbox(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                String phonenumber = SM2CryptUtils.decrypt(record.getPhonenumber(), SecretKeyConstants.SERVER_PRIVATE_KEY);
-                                // 脱密处理
-                                idcard = DesensitizedUtil.idCardNum(idcard,5,2);
-                                nickname = DesensitizedUtil.chineseName(nickname);
-                                mailbox = DesensitizedUtil.email(mailbox);
-                                phonenumber = DesensitizedUtil.mobilePhone(phonenumber);
-                                // 封装新增操作
-                                StringBuffer parameterContent = new StringBuffer("");
-                                parameterContent.append("账号："+record.getUsername());
-                                parameterContent.append(",身份证号码："+idcard);
-                                if ("0".equals(record.getUsertype())){
-                                    parameterContent.append(",用户类型：管理员");
-                                }
-                                else {
-                                    parameterContent.append(",用户类型：业务用户");
-                                }
-
-                                parameterContent.append(",姓名："+nickname);
-                                parameterContent.append(",邮箱："+mailbox);
-                                parameterContent.append(",手机号码："+phonenumber);
-                                if (record.getExpDate()==null){
-
-                                }
-                                else {
-                                    parameterContent.append(",账号有效期："+DateFormatUtils.format(record.getExpDate(),"yyyy-MM-dd"));
-                                }
-                                record.setParameterContent(parameterContent.toString());
-                            }
+//                            else if (record.getOperation().equals(String.valueOf(ApproveOperaterEnum.RELOCK.getCode()))){
+//                                // 敏感数据先解密
+//                                String idcard = SM2CryptUtils.decrypt(record.getIdcard(), SecretKeyConstants.SERVER_PRIVATE_KEY);
+//                                String nickname = SM2CryptUtils.decrypt(record.getNickname(), SecretKeyConstants.SERVER_PRIVATE_KEY);
+//                                String mailbox = SM2CryptUtils.decrypt(record.getMailbox(), SecretKeyConstants.SERVER_PRIVATE_KEY);
+//                                String phonenumber = SM2CryptUtils.decrypt(record.getPhonenumber(), SecretKeyConstants.SERVER_PRIVATE_KEY);
+//                                // 脱密处理
+//                                idcard = DesensitizedUtil.idCardNum(idcard,5,2);
+//                                nickname = DesensitizedUtil.chineseName(nickname);
+//                                mailbox = DesensitizedUtil.email(mailbox);
+//                                phonenumber = DesensitizedUtil.mobilePhone(phonenumber);
+//                                // 封装新增操作
+//                                StringBuffer parameterContent = new StringBuffer("");
+//                                parameterContent.append("账号："+record.getUsername());
+//                                parameterContent.append(",身份证号码："+idcard);
+//                                if ("0".equals(record.getUsertype())){
+//                                    parameterContent.append(",用户类型：管理员");
+//                                }
+//                                else {
+//                                    parameterContent.append(",用户类型：业务用户");
+//                                }
+//
+//                                parameterContent.append(",姓名："+nickname);
+//                                parameterContent.append(",邮箱："+mailbox);
+//                                parameterContent.append(",手机号码："+phonenumber);
+//                                if (record.getExpDate()==null){
+//
+//                                }
+//                                else {
+//                                    parameterContent.append(",账号有效期："+DateFormatUtils.format(record.getExpDate(),"yyyy-MM-dd"));
+//                                }
+//                                record.setParameterContent(parameterContent.toString());
+//                            }
                         }
                     }
             );

backend/src/main/java/com/jiayue/ssi/controller/SysUserController.java

@@ -607,36 +607,36 @@ public class SysUserController {
             }
 
             // 根据id改变状态为注销，提交到审核
-            SysApprove sysApprove = new SysApprove();
-            sysApprove.setUsername(sysUser.getUsername());
-            sysApprove.setNickname(sysUser.getNickname());
-            sysApprove.setIdcard(sysUser.getIdcard());
-            sysApprove.setMailbox(sysUser.getMailbox());
-            sysApprove.setPhonenumber(sysUser.getPhonenumber());
-            sysApprove.setUsertype(sysUser.getUsertype());
-            sysApprove.setStatus(sysUser.getStatus());
-            sysApprove.setMasterId(String.valueOf(sysUser.getId()));
-            sysApprove.setParameterContent(JSONUtil.parse(sysUser).toString());
-            // 用户新增插入审批表
-            sysApprove.setModuleName(ApproveConstants.MODULE_NAME_USER);
-            sysApprove.setOperation(String.valueOf(ApproveOperaterEnum.RELOCK.getCode()));
-            sysApprove.setApproveStatus(String.valueOf(ApproveStatusEnum.DSP.getCode()));
-            sysApprove.setEntityName("SysUser");
-            boolean bo = sysUserService.addUserByApprove(Long.parseLong(id),sysApprove);
-            if (bo) {
-                return ResponseVO.success("解锁用户成功,等待审核管理员进行审核！");
-            } else {
-                log.error("解锁用户失败");
-                return ResponseVO.fail("解锁用户失败");
-            }
-
-//            boolean bo = sysUserService.relockUserById(Integer.parseInt(id));
+//            SysApprove sysApprove = new SysApprove();
+//            sysApprove.setUsername(sysUser.getUsername());
+//            sysApprove.setNickname(sysUser.getNickname());
+//            sysApprove.setIdcard(sysUser.getIdcard());
+//            sysApprove.setMailbox(sysUser.getMailbox());
+//            sysApprove.setPhonenumber(sysUser.getPhonenumber());
+//            sysApprove.setUsertype(sysUser.getUsertype());
+//            sysApprove.setStatus(sysUser.getStatus());
+//            sysApprove.setMasterId(String.valueOf(sysUser.getId()));
+//            sysApprove.setParameterContent(JSONUtil.parse(sysUser).toString());
+//            // 用户新增插入审批表
+//            sysApprove.setModuleName(ApproveConstants.MODULE_NAME_USER);
+//            sysApprove.setOperation(String.valueOf(ApproveOperaterEnum.RELOCK.getCode()));
+//            sysApprove.setApproveStatus(String.valueOf(ApproveStatusEnum.DSP.getCode()));
+//            sysApprove.setEntityName("SysUser");
+//            boolean bo = sysUserService.addUserByApprove(Long.parseLong(id),sysApprove);
 //            if (bo) {
-//                return ResponseVO.success("解锁成功");
+//                return ResponseVO.success("解锁用户成功,等待审核管理员进行审核！");
 //            } else {
-//                log.error("解锁失败");
-//                return ResponseVO.fail("解锁失败");
+//                log.error("解锁用户失败");
+//                return ResponseVO.fail("解锁用户失败");
 //            }
+
+            boolean bo = sysUserService.relockUserById(Integer.parseInt(id));
+            if (bo) {
+                return ResponseVO.success("解锁成功");
+            } else {
+                log.error("解锁失败");
+                return ResponseVO.fail("解锁失败");
+            }
         } catch (Exception e) {
             throw new CustomException("解锁异常", e);
         }

backend/src/main/java/com/jiayue/ssi/service/impl/SysApproveServiceImpl.java

@@ -99,19 +99,19 @@ public class SysApproveServiceImpl extends ServiceImpl<SysApproveMapper, SysAppr
                 sysUser.setSignstr("0");
                 sysUserMapper.updateById(sysUser);
             }
-            else if (newsysApprove.getOperation().equals(String.valueOf(ApproveOperaterEnum.RELOCK.getCode()))){
-                // 解锁操作
-                SysUser sysUser = new SysUser();
-                sysUser.setId(Long.parseLong(newsysApprove.getMasterId()));
-                if ("0".equals(newsysApprove.getApproveResult())){
-                    // 审核通过，修改姓名、邮箱、手机号、有效日期
-                    sysUser.setStatus("0");
-                    sysUser.setLockTime(0L);
-                    sysUser.setLoginDate(new Date());
-                }
-                sysUser.setSignstr("0");
-                sysUserMapper.updateById(sysUser);
-            }
+//            else if (newsysApprove.getOperation().equals(String.valueOf(ApproveOperaterEnum.RELOCK.getCode()))){
+//                // 解锁操作
+//                SysUser sysUser = new SysUser();
+//                sysUser.setId(Long.parseLong(newsysApprove.getMasterId()));
+//                if ("0".equals(newsysApprove.getApproveResult())){
+//                    // 审核通过，修改姓名、邮箱、手机号、有效日期
+//                    sysUser.setStatus("0");
+//                    sysUser.setLockTime(0L);
+//                    sysUser.setLoginDate(new Date());
+//                }
+//                sysUser.setSignstr("0");
+//                sysUserMapper.updateById(sysUser);
+//            }
         }
     }
 }

ui/src/views/examineManager/sysApprove/index.vue

@@ -117,7 +117,7 @@ export default {
       operationOptions: [
         {value: '0', label: '新增'},
         {value: '1', label: '修改'},
-        {value: '2', label: '删除'},
+        {value: '2', label: '注销'},
         {value: '3', label: '授权'}
       ],
       // 遮罩层
@@ -171,8 +171,6 @@ export default {
           belongTo = "注销"
         } else if (cellValue == "3") {
           belongTo = "授权"
-        } else if (cellValue == "4") {
-          belongTo = "解锁"
         }
       }
       return belongTo