修改账号停用返回提示，审批不通过，更换编辑人也擦除相应字段数据，增加修改授权的日志

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/HouseController.java

@@ -563,6 +563,14 @@ public class HouseController extends BaseController {
             houseEntity.setCanNotEditDesc(null);
         }
 
+        if(null != houseEntity.getCanNotEdit() && houseEntity.getCanNotEdit().compareTo(0) == 0){
+            //重新分配制作人，前面不通过的审批，需要擦除,TODO:需要添加一个上一状态，用于追踪
+            houseEntity.setAuditResult(null);
+            houseEntity.setAuditDesc(null);
+            houseEntity.setCanNotEdit(1);
+            houseEntity.setCanNotEditDesc(null);
+        }
+
         int update = houseService2.updateAll(houseEntity);
         if(update != 1){
             throw new CommonBaseException(ResultCodeEnum.D101 , "更新房源数据失败");
@@ -728,8 +736,6 @@ public class HouseController extends BaseController {
         }
 
         if (flagQ) {
-          /*  mqMap.put("id", house.getId());
-            mqMap.put("basePath", savePath);*/
 
             // 上传floorplan.json到oss, 并命名为floor.json
             HashMap<String, String> uploadJson = new HashMap<>();

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/IndexController.java

@@ -142,7 +142,7 @@ public class IndexController extends BaseController {
             // 检查账号是否启用
             if (user.getStatus() != 0) {
                 log.error("账户已停用，不能登录： {}", adminRegisterVo.getPhoneNum());
-                throw new CommonBaseException(ResultCodeEnum.D101, "用户已经停用");
+                throw new CommonBaseException(ResultCodeEnum.D101, "账号已停用，如需使用请联系管理员");
             }
         }
         return result;

fdkanfang-web/src/main/java/com/fdkanfang/web/backend/UserController.java

@@ -276,7 +276,11 @@ public class UserController extends BaseController {
         userService2.deleteUserRoleByUserId(id);
 
         // 删除redis role
-        redisTemplate.delete(roleskey + id);
+        if(!redisTemplate.delete(roleskey + id)){
+            log.warn("删除角色[{}]在redis中的缓存key=[{}]失败" , roleskey + id);
+        }else{
+            log.info("删除角色[{}]在redis中的缓存key=[{}]成功" , roleskey + id);
+        }
 
 
         // 重新添加角色