修改bug

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AuditController.java

@@ -88,12 +88,6 @@ public class AuditController extends BaseController {
     @ApiOperation(value = "修改禁用审核信息", notes = "修改禁用审核信息")
     public Map<String, Object> updateAudit(@RequestBody @Validated(value = {Update.class}) Audit audit) {
         boolean flag;
-        //如果当前审核状态为通过，并且审核层级为初审
-        if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) && AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
-            //初审通过，提交复审，设置层级为复审
-            audit.setLevel(AuditStatusEnum.TBCA.name());
-            audit.setStatus(AuditStatusEnum.TBCA.name());
-        }
         //如果层级是初审，设置初审时间
         if (AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
             audit.setFirstTime(LocalDateTime.now());
@@ -101,7 +95,7 @@ public class AuditController extends BaseController {
             if (!AuditStatusEnum.REFUSED.name().equals(audit.getStatus())) {
                 audit.setFirstRemarks("");
             }
-        } else {
+        }else{
             //如果层级是复审，设置复审时间
             audit.setSecondTime(LocalDateTime.now());
             //如果审核状态不是驳回，清空驳回原因
@@ -109,13 +103,17 @@ public class AuditController extends BaseController {
                 audit.setSecondRemarks("");
             }
         }
+        //如果当前审核状态为通过，并且审核层级为初审
+        if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus()) && AuditStatusEnum.TBC.name().equals(audit.getLevel())) {
+            //初审通过，提交复审，设置层级为复审
+            audit.setLevel(AuditStatusEnum.TBCA.name());
+            audit.setStatus(AuditStatusEnum.TBCA.name());
+        }
         try {
             //如果类型是用户禁用审核
             if (AuditTypeEnum.ACCOUNT.name().equals(audit.getType())) {
-                Audit audit1 = auditService.getById(audit.getId());
                 //设置用户原始数据状态
-                TUser user = new TUser();
-                user.setId(audit1.getRefItemId());
+                TUser user = userService.getById(audit.getRefItemId());
                 user.setAuditStatus(audit.getStatus());
                 //如果复审通过，真正禁用用户
                 if (AuditStatusEnum.APPROVED_FINAL.name().equals(audit.getStatus())) {

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java

@@ -59,10 +59,13 @@ public class TBoxOperationController extends BaseController {
             user.setOrgId(organId);
         }
         if (StringUtils.isNotBlank(areaId)) {
-            String areaId1 = getAreaId(areaId);
-            user.setAreaId(areaId1);
+            user.setAreaId(areaId);
         }
         //设置数据权限
+        if (StringUtils.isNotBlank(user1.getAreaId())) {
+            String areaId1 = getAreaId(user1.getAreaId());
+            user.setAreaName(getAreaId(areaId1));
+        }
         user.setOrgCode(user1.getOrgCode());
         try {
             Page<TBoxOperation> page = tBoxOperationService.selectBoxPage(getPage(), user);
@@ -100,7 +103,7 @@ public class TBoxOperationController extends BaseController {
 
     @PutMapping("/update")
     @RequiresPermissions("/boxOperation/update")
-    @ApiOperation(value = "修改机顶盒运维信息信息", notes = "修改机顶盒运维信息信息")
+    @ApiOperation(value = "修改机顶盒运维信息", notes = "修改机顶盒运维信息")
     public Map<String, Object> updateTBoxOperation(TBoxOperation tBoxOperation) {
         try {
             if (tBoxOperation != null && StringUtils.isNotBlank(tBoxOperation.getMac())) {
@@ -182,7 +185,7 @@ public class TBoxOperationController extends BaseController {
         }
         if (StringUtils.isNotBlank(user.getAreaId())) {
             //设置数据权限
-            tBoxOperation.setAreaId(getAreaId(user.getAreaId()));
+            tBoxOperation.setAreaName(getAreaId(user.getAreaId()));
         }
         Page<TBoxOperation> page = null;
         try {

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

@@ -216,7 +216,7 @@ public class TUserController extends BaseController {
             if ("2".equals(user.getType())) {
                 QueryWrapper<TUser> ew = new QueryWrapper<>();
                 user.setUserName(user.getUserName().trim());
-                ew.eq("is_deleted", 0);
+                ew.eq("is_deleted", false);
                 ew.eq("type", "2");
                 ew.eq("org_id", user.getOrgId());
                 List<TUser> list = userService.list(ew);
@@ -229,7 +229,7 @@ public class TUserController extends BaseController {
             QueryWrapper<TUser> ew = new QueryWrapper<>();
             if (StringUtils.isNoneBlank(user.getUserName())) {
                 user.setUserName(user.getUserName().trim());
-                ew.eq("is_deleted", 0);
+                ew.eq("is_deleted", false);
                 ew.eq("user_name", user.getUserName());
                 TUser one = this.userService.getOne(ew);
                 if (one != null) {
@@ -288,15 +288,48 @@ public class TUserController extends BaseController {
     @PutMapping(value = "/update")
     @RequiresPermissions("/user/update")
     @MethodLog(operModule = OperModule.USER, operType = OperType.UPDATE)
-    public ResponseEntity<Map<String, Object>> edit(@RequestBody TUser user) {
+    public Map<String, Object>  edit(@RequestBody TUser user) {
         Map<String, Object> resultMap = new HashMap<>();
         try {
             boolean ret = false;
             if (user.getId() != null) {
-                if ("1".equals(user.getId()) && "2".equals(user.getStatus())) {
-                    resultMap.put("status", "400");
-                    resultMap.put("message", "该账号不能被禁用");
-                    return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+
+                if (StringUtils.isNoneBlank(user.getUserName())) {
+                    QueryWrapper<TUser> ew = new QueryWrapper<>();
+                    user.setUserName(user.getUserName().trim());
+                    ew.eq("is_deleted", false);
+                    ew.eq("user_name", user.getUserName());
+                    TUser one = this.userService.getOne(ew);
+                    TUser tUser = userService.getById(user.getId());
+                    if (one != null&&!one.getUserName().equals(tUser.getUserName())) {
+                        resultMap.put("resultCode", "200");
+                        resultMap.put("message", "账号已存在！");
+                        return resultMap;
+                    }
+                }
+                if (StringUtils.isNoneBlank(user.getOrgId())&&StringUtils.isNoneBlank(user.getType())&&"3".equals(user.getType())) {
+                    QueryWrapper<TUser> ew = new QueryWrapper<>();
+                    ew.eq("is_deleted", false);
+                    ew.eq("type", "3");
+                    ew.eq("org_id", user.getOrgId());
+                    List<TUser> list = this.userService.list(ew);
+                    if (list != null&&list.size()>1&&list.get(0)!=null) {
+                        resultMap.put("resultCode", "500");
+                        resultMap.put("message", "每个单位只能有一个机顶盒账号！");
+                        return resultMap;
+                    }
+                }
+                if ("2".equals(user.getType())) {
+                    QueryWrapper<TUser> ew = new QueryWrapper<>();
+                    ew.eq("is_deleted", false);
+                    ew.eq("type", "2");
+                    ew.eq("org_id", user.getOrgId());
+                    List<TUser> list = userService.list(ew);
+                    if (list.size() >= 3) {
+                        resultMap.put("resultCode", "200");
+                        resultMap.put("message", "机构已存在三个单位管理员！");
+                        return resultMap;
+                    }
                 }
 
 //                user.setUserName(StringUtils.trimToNull(user.getUserName()));
@@ -327,24 +360,24 @@ public class TUserController extends BaseController {
                 // 更新失败, 400
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "请选择用户");
-                return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
+                return resultMap;
             }
 
             if (!ret) {
                 // 更新失败, 500
                 resultMap.put("resultCode", "500");
                 resultMap.put("message", "服务器忙");
-                return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(resultMap);
+                return resultMap;
             }
             // 204
             resultMap.put("resultCode", "200");
             resultMap.put("message", "更新成功");
-            return ResponseEntity.ok(resultMap);
+            return resultMap;
         } catch (Exception e) {
             logger.error("更新错误!", e);
         }
         // 500
-        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
+        return resultMap;
     }
 
     @OperationLog("删除成员")
@@ -589,7 +622,7 @@ public class TUserController extends BaseController {
             QueryWrapper<TUser> ew = new QueryWrapper<>();
             if (StringUtils.isNoneBlank(user.getUserName())) {
                 user.setUserName(user.getUserName().trim());
-                ew.eq("is_deleted", 0);
+                ew.eq("is_deleted", false);
                 ew.eq("user_name", user.getUserName());
                 TUser one = this.userService.getOne(ew);
                 if (one != null) {
@@ -676,7 +709,7 @@ public class TUserController extends BaseController {
             QueryWrapper<TUser> ew = new QueryWrapper<>();
             if (StringUtils.isNoneBlank(user.getUserName())) {
                 user.setUserName(user.getUserName().trim());
-                ew.eq("is_deleted", 0);
+                ew.eq("is_deleted", false);
                 ew.eq("user_name", user.getUserName());
                 TUser one = this.userService.getOne(ew);
                 if (one != null) {
@@ -741,7 +774,7 @@ public class TUserController extends BaseController {
             QueryWrapper<TUser> ew = new QueryWrapper<>();
             if (StringUtils.isNoneBlank(user.getUserName())) {
                 user.setUserName(user.getUserName().trim());
-                ew.eq("is_deleted", 0);
+                ew.eq("is_deleted", false);
                 ew.eq("user_name", user.getUserName());
                 TUser one = this.userService.getOne(ew);
                 if (one != null) {

src/main/resources/mapper/TBoxOperationMapper.xml

@@ -51,6 +51,9 @@ left join t_organ r on r.id = b.organ_id
         <if test="user.orgCode != null and user.orgCode != '' ">
             and o.code LIKE concat(#{user.orgCode}, '%')
         </if>
+        <if test="user.areaName != null and user.areaName != '' ">
+            and b.area_id LIKE concat(#{user.areaName}, '%')
+        </if>
         and u.is_deleted = false
         and u.type = 3
         order by b.create_time desc
@@ -68,7 +71,10 @@ left join t_organ r on r.id = b.organ_id
             and b.status =#{tBoxOperation.status}
         </if>
         <if test="tBoxOperation.areaId != null and tBoxOperation.areaId != '' ">
-            and r.area_id like concat(#{tBoxOperation.areaId}, '%')
+            and b.area_id = #{tBoxOperation.areaId}
+        </if>
+        <if test="tBoxOperation.areaName != null and tBoxOperation.areaName != '' ">
+            and b.area_id LIKE concat(#{tBoxOperation.areaName}, '%')
         </if>
     </select>