修改删除账号

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/BackUserAccountServiceImpl.java

@@ -162,7 +162,6 @@ public class BackUserAccountServiceImpl implements BackUserAccountService {
         if (companyInfoVO != null && companyInfoVO.getCompanyType().equals(CompanyTypeEnums.FRANCHISEE.getType())) {
             // 加盟企业的账号，需要把对应的成员和后台账号解绑
             companyService.unbindingAllUsers(companyInfoVO.getId());
-            companyService.deleteCompanyInfoById(companyInfoVO.getId());
         }
         String accountNo = "DISABLE_" + backUserAccountDO.getAccountNo() + RandomStringUtils.randomAlphanumeric(3);
         backUserAccountDao.disableBackUserAccountDO(accountId, accountNo);

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/impl/UserAccountServiceImpl.java

@@ -6,6 +6,7 @@ import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.response.ResultEnum;
 import com.mmc.iuav.user.controller.userpoints.config.NumberOfUserPoints;
 import com.mmc.iuav.user.controller.userpoints.config.UserPointsEnum;
+import com.mmc.iuav.user.dao.CompanyDao;
 import com.mmc.iuav.user.dao.CooperationDao;
 import com.mmc.iuav.user.dao.RealNameAuthDao;
 import com.mmc.iuav.user.dao.UserServiceDao;
@@ -363,12 +364,26 @@ public class UserAccountServiceImpl implements UserAccountService {
         }
     }
 
+    @Autowired
+    private CompanyDao companyDao;
+
     @Override
     public ResultBody disableAppAccount(Integer userAccountId) {
         userServiceDao.disableUserAccount(CodeUtil.removeUserAccount(), userAccountId);
         UserAccountVO userAccountVO = new UserAccountVO();
         userAccountVO.setId(userAccountId);
         userAccountVO.setDeleted(1);
+        // 删除绑定企业信息，
+        // 该企业只有一人时可以直接删除，或者不是管理员时也可以直接删除，
+        // 是管理者时并且有多人则不能删除，提醒解绑成员后才能删除
+        CompanyInfoDO companyInfoDO = companyDao.getAppCompanyInfoUId(userAccountId);
+        if (companyInfoDO != null) {
+            int members = companyDao.countCompanyMembers(companyInfoDO.getId());
+            if (members > 1 && companyInfoDO.getLeader().equals(1)) {
+                return ResultBody.error("该用户是单位管理员，暂时不能删除");
+            }
+            companyDao.unbindCompanyMember(userAccountId, companyInfoDO.getId());
+        }
         mqProducer.sentUserInfoChangedMsg(userAccountVO);
         return ResultBody.success();
     }