修改bug

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

@@ -77,7 +77,9 @@ public class TBoxOperationController extends BaseController {
 //            String areaId1 = getAreaId(user1.getAreaId());
 //            user.setAreaName(areaId1);
 //        }
-        user.setOrgCode(user1.getOrgCode());
+        if (!user1.getRoleList().contains("1")) {
+            user.setOrgCode(user1.getOrgCode());
+        }
         try {
             Page<TBoxOperation> page = tBoxOperationService.selectBoxPage(getPage(), user);
             return getResult(page);
@@ -197,10 +199,16 @@ public class TBoxOperationController extends BaseController {
     public Map<String, Object> getTBoxOperationList(String status) {
         List<TBoxOperation> tBoxOperationList = null;
         TUser user = getcurUser();
-        //设置数据权限
-        String areaId = user.getAreaId();
+
         try {
-            tBoxOperationList = tBoxOperationService.getList(status, getAreaId(areaId));
+            if (!user.getRoleList().contains("1")) {
+                //设置数据权限
+                String areaId = user.getAreaId();
+                tBoxOperationList = tBoxOperationService.getList(status, getAreaId(areaId));
+            }else {
+                tBoxOperationList = tBoxOperationService.getList(status, null);
+            }
+
             return getResult(tBoxOperationList);
         } catch (Exception e) {
             e.printStackTrace();
@@ -232,8 +240,10 @@ public class TBoxOperationController extends BaseController {
            tBoxOperation.setAreaId(areaId);
         }
         if (StringUtils.isNotBlank(user.getAreaId())) {
-            //设置数据权限
-            tBoxOperation.setAreaName(getAreaId(user.getAreaId()));
+            if (!user.getRoleList().contains("1")) {
+                //设置数据权限
+                tBoxOperation.setAreaName(getAreaId(user.getAreaId()));
+            }
         }
         Page<TBoxOperation> page = null;
         try {

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

@@ -81,7 +81,7 @@ public class TUserController extends BaseController {
     @RequestMapping(value = "/getPageList", method = RequestMethod.GET)
     @RequiresAuthentication  //@RequiresPermissions("/user/getPageList")
     @MethodLog(operModule = OperModule.USER, operType = OperType.SELECT)
-    public Map<String, Object> getPageList( String type,String userName,String status, String orgId, String areaId) {
+    public Map<String, Object> getPageList(String type, String userName, String status, String orgId, String areaId) {
         TUser user1 = getcurUser();
         TUser user = new TUser();
         if (StringUtils.isNotBlank(userName)) {
@@ -112,7 +112,7 @@ public class TUserController extends BaseController {
             user.setAreaId(areaId);
         }
         if (StringUtils.isNotBlank(status)) {
-            if (AuditOperationEnum.ENABLE.name().equals(status)||AuditOperationEnum.DISABLE.name().equals(status)) {
+            if (AuditOperationEnum.ENABLE.name().equals(status) || AuditOperationEnum.DISABLE.name().equals(status)) {
                 user.setStatus(status);
             } else {
                 user.setAuditStatus(status);
@@ -137,17 +137,17 @@ public class TUserController extends BaseController {
         TUser user = new TUser();
         try {
             if (StringUtils.isNotBlank(type)) {
-               user.setType(type);
+                user.setType(type);
                 if (!"4".equals(type) && !"5".equals(type)) {
                     //设置用户数据权限
-                   user.setOrgCode(user1.getOrgCode());
+                    user.setOrgCode(user1.getOrgCode());
                 }
             }
             if (StringUtils.isNotBlank(auditStatus)) {
                 user.setAuditStatus(auditStatus);
             }
             if (StringUtils.isNotBlank(status)) {
-                if (AuditOperationEnum.ENABLE.name().equals(status)||AuditOperationEnum.DISABLE.name().equals(status)) {
+                if (AuditOperationEnum.ENABLE.name().equals(status) || AuditOperationEnum.DISABLE.name().equals(status)) {
                     user.setStatus(status);
                 } else {
                     user.setAuditStatus(status);
@@ -169,7 +169,7 @@ public class TUserController extends BaseController {
         try {
             TUser tUser = userService.selectById(id);
             List<Role> list = roleService.selectRoleByUserId(id);
-            if (list != null && list.get(0) != null) {
+            if (list != null && list.size()>0&&list.get(0) != null) {
                 List<String> list1 = new ArrayList<>();
                 list.forEach(r -> list1.add(r.getId()));
                 tUser.setRoleList(list1);
@@ -201,17 +201,6 @@ public class TUserController extends BaseController {
             } else {
                 user.setPassword(StringUtils.trimToNull(user.getPassword()));
             }
-
-            if (user.getRoleList() == null || user.getRoleList().size() < 1) {
-                if ("2".equals(user.getType())) {
-                    user.setRoleList(new ArrayList<>());
-                    user.getRoleList().add("1");
-                } else {
-                    resultMap.put("resultCode", "400");
-                    resultMap.put("message", "请选择角色！");
-                    return resultMap;
-                }
-            }
             if (StringUtils.isBlank(user.getOrgId())) {
                 resultMap.put("resultCode", "400");
                 resultMap.put("message", "请选择机构！");
@@ -233,6 +222,12 @@ public class TUserController extends BaseController {
                 strings.add("2");
                 user.setRoleList(strings);
             }
+
+            if (user.getRoleList() == null || user.getRoleList().size() < 1) {
+                resultMap.put("resultCode", "400");
+                resultMap.put("message", "请选择角色！");
+                return resultMap;
+            }
             QueryWrapper<TUser> ew = new QueryWrapper<>();
             if (StringUtils.isNoneBlank(user.getUserName())) {
                 user.setUserName(user.getUserName().trim());
@@ -240,7 +235,7 @@ public class TUserController extends BaseController {
                 ew.eq("user_name", user.getUserName());
                 TUser one = this.userService.getOne(ew);
                 if (one != null) {
-                    resultMap.put("resultCode", "200");
+                    resultMap.put("resultCode", "500");
                     resultMap.put("message", "账号已存在！");
                     return resultMap;
                 }
@@ -295,33 +290,37 @@ public class TUserController extends BaseController {
     @PutMapping(value = "/update")
     @RequiresAuthentication   //@RequiresPermissions("/user/update")
     @MethodLog(operModule = OperModule.USER, operType = OperType.UPDATE)
-    public 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 (StringUtils.isNoneBlank(user.getUserName())) {
+                if (StringUtils.isNoneBlank(user.getUserName().trim())) {
                     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");
+                    if (one != null && !one.getUserName().equals(tUser.getUserName())) {
+                        resultMap.put("resultCode", "400");
                         resultMap.put("message", "账号已存在！");
                         return resultMap;
                     }
+                } else {
+                    resultMap.put("resultCode", "400");
+                    resultMap.put("message", "账号名不能为空！");
+                    return resultMap;
                 }
-                if (StringUtils.isNoneBlank(user.getOrgId())&&StringUtils.isNoneBlank(user.getType())&&"3".equals(user.getType())) {
+                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");
+                    if (list != null && list.size() > 1 && list.get(0) != null) {
+                        resultMap.put("resultCode", "400");
                         resultMap.put("message", "每个单位只能有一个机顶盒账号！");
                         return resultMap;
                     }
@@ -333,7 +332,7 @@ public class TUserController extends BaseController {
                     ew.eq("org_id", user.getOrgId());
                     List<TUser> list = userService.list(ew);
                     if (list.size() >= 3) {
-                        resultMap.put("resultCode", "200");
+                        resultMap.put("resultCode", "400");
                         resultMap.put("message", "机构已存在三个单位管理员！");
                         return resultMap;
                     }
@@ -350,7 +349,7 @@ public class TUserController extends BaseController {
 
 
                 List<String> list = user.getRoleList();
-                if (list != null && list.size() > 0&&list.get(0)!=null) {
+                if (list != null && list.size() > 0 && list.get(0) != null) {
                     ArrayList<TUserRole> list1 = new ArrayList<>();
                     for (String r : list) {
                         TUserRole userRole = new TUserRole();
@@ -647,7 +646,7 @@ public class TUserController extends BaseController {
                 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) {
+                if (list != null && list.size() > 1 && list.get(0) != null) {
                     resultMap.put("resultCode", "500");
                     resultMap.put("message", "该单位机顶盒账号已存在！");
                     return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
@@ -713,7 +712,7 @@ public class TUserController extends BaseController {
                 ew.eq("user_name", user.getUserName());
                 TUser one = this.userService.getOne(ew);
                 if (one != null) {
-                    resultMap.put("resultCode", "200");
+                    resultMap.put("resultCode", "500");
                     resultMap.put("message", "账号已存在！");
                     return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
                 }
@@ -784,7 +783,7 @@ public class TUserController extends BaseController {
                 ew.eq("user_name", user.getUserName());
                 TUser one = this.userService.getOne(ew);
                 if (one != null) {
-                    resultMap.put("resultCode", "200");
+                    resultMap.put("resultCode", "500");
                     resultMap.put("message", "账号已存在！");
                     return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(resultMap);
                 }
@@ -842,24 +841,24 @@ public class TUserController extends BaseController {
             boolean ret = false;
             if (StringUtils.isNotBlank(user.getOrgName())) {
 
-                    QueryWrapper<TUser> ew = new QueryWrapper<>();
-                    ew.eq("is_deleted", false);
-                    ew.eq("type", "3");
-                    ew.eq("user_name", user.getOrgName());
-                    TUser one = userService.getOne(ew);
-                    one.setPermanent(false);
-                    one.setEffectiveDate(null);
-                    one.setExiredDate(null);
-                    if (user.getPermanent()!=null){
-                        one.setPermanent(user.getPermanent());
-                    }
-                    if (user.getEffectiveDate()!=null){
-                        one.setEffectiveDate(user.getEffectiveDate());
-                    }
-                    if (user.getExiredDate()!=null){
-                        one.setExiredDate(user.getExiredDate());
-                    }
-                    user=one;
+                QueryWrapper<TUser> ew = new QueryWrapper<>();
+                ew.eq("is_deleted", false);
+                ew.eq("type", "3");
+                ew.eq("user_name", user.getOrgName());
+                TUser one = userService.getOne(ew);
+                one.setPermanent(false);
+                one.setEffectiveDate(null);
+                one.setExiredDate(null);
+                if (user.getPermanent() != null) {
+                    one.setPermanent(user.getPermanent());
+                }
+                if (user.getEffectiveDate() != null) {
+                    one.setEffectiveDate(user.getEffectiveDate());
+                }
+                if (user.getExiredDate() != null) {
+                    one.setExiredDate(user.getExiredDate());
+                }
+                user = one;
 
                 ret = userService.updateById(user);
             } else {