用户删除优化

tianhu-system/src/main/java/com/tianhu/system/controller/SysUserController.java

@@ -312,7 +312,7 @@ public class SysUserController extends BaseController
             }
             //登录错误到达五次就转为冻结
             BigDecimal bigDecimal = new BigDecimal(frozenSecond);
-            BigDecimal decimal = new BigDecimal("5");
+            BigDecimal decimal = new BigDecimal("4");
             if (decimal.compareTo(bigDecimal) == 0) {
                 SysUser user = new SysUser();
                 user.setUserId(sysUser.getUserId());
@@ -638,9 +638,9 @@ public class SysUserController extends BaseController
         Map useMap = new HashMap();
         useMap.put("userName",user.getUserName());
         List<Map> listNormalUser = userService.selectNormalUser(useMap);
-        if(listNormalUser.size() > 0){
+        if(queryUser != null){
            //获取用户Id
-           String userId = listNormalUser.get(0).get("userId")+"";
+           Long userId = queryUser.getUserId();
            //查询此企业是否存在此用户
            LambdaQueryWrapper<SysUserCompanyRel> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(SysUserCompanyRel::getSucrUserId,userId);
@@ -650,12 +650,10 @@ public class SysUserController extends BaseController
                 return AjaxResult.error("新增用户'" + user.getUserName() + "'失败，用户已存在");
             }
         } else{
-            if(queryUser == null) {
-                user.setStatus("0");
-                user.setPassword(SecurityUtils.encryptPassword(password));
-                user.setCreateBy(SecurityUtils.getUsername());
-                userMapper.insertUser(user);
-            }
+            user.setStatus("0");
+            user.setPassword(SecurityUtils.encryptPassword(password));
+            user.setCreateBy(SecurityUtils.getUsername());
+            userMapper.insertUser(user);
         }
 
         Long[] roles = user.getRoleIds();
@@ -702,7 +700,7 @@ public class SysUserController extends BaseController
 //                "医疗招商、医疗集采、供应链金融等企业级服务，如果您再平台使用中遇到任何问题，" +
 //                "请再首页查看并拨打平台客服专线电话，我们将竭尽所能为您提供免费的咨询服务";
 //        remoteSystemService.sendNotice(use.getCompanyId(),use.getCompanyId(),tittle,"01","00",null,"0",String.valueOf(queryUser.getUserId()),null);
-        if (listNormalUser.size() < 0) {
+        if (queryUser == null) {
             Map passwordMap =new HashMap();
             passwordMap.put("password",SecurityUtils.encryptPassword(password));
             messageUtilsService.sendMessageCode(user.getPhonenumber(),zhucechenggong,passwordMap,null);
@@ -775,10 +773,31 @@ public class SysUserController extends BaseController
      */
     @PreAuthorize(hasPermi = "system:user:remove")
     @Log(title = "用户管理", businessType = BusinessType.DELETE)
+    @Transactional(rollbackFor=Exception.class)
     @DeleteMapping("/{userIds}")
-    public AjaxResult remove(@PathVariable Long[] userIds)
+    public AjaxResult remove(@PathVariable Long[] userIds)throws Exception
     {
-        return toAjax(userService.deleteUserByIds(userIds));
+        //查询用户企业信息
+        LambdaQueryWrapper<SysUserCompanyRel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysUserCompanyRel::getSucrUserId,userIds);
+        List<SysUserCompanyRel> list = iSysUserCompanyRelService.findSysUserCompanyRels(queryWrapper);
+        //删除企业与用户信息
+        for (SysUserCompanyRel sysUserCompanyRel : list){
+            Long userId = sysUserCompanyRel.getSucrUserId();
+            String companyId = sysUserCompanyRel.getSucrCompanyId();
+            Long deptId = sysUserCompanyRel.getSucrDeptId();
+            //删除用户企业关联数据
+            LambdaQueryWrapper<SysUserCompanyRel> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(SysUserCompanyRel::getSucrUserId,userId);
+            wrapper.eq(SysUserCompanyRel::getSucrCompanyId,companyId);
+            iSysUserCompanyRelService.deleteSysUserCompanyRel(wrapper);
+            //审批删除部门分组
+            Map<String, Object> flowableRes = flowableService.deleteFlowableUserGroup(String.valueOf(userId), String.valueOf(deptId));
+            if (!"200".equals(flowableRes.get("code"))) {
+                throw new Exception("审批数据新增失败!");
+            }
+        }
+        return AjaxResult.success();
     }
 
     /**