巡检查询

operation_manager/src/main/java/com/huaxu/task/controller/PlanManageController.java

@@ -171,7 +171,7 @@ public class PlanManageController {
         map.put("currentUsers",currentUsers);
         int rows = planManageService.selectPendingPower(map);
         if(rows>0){
-            new AjaxMessage<Boolean>(ResultStatus.OK, true);
+            return new AjaxMessage<Boolean>(ResultStatus.OK, true);
         }
         return new AjaxMessage<Boolean>(ResultStatus.OK, false);
     }
@@ -327,32 +327,31 @@ public class PlanManageController {
             for( int i =0 ;i<idList.size(); i++){
                 ids[i] = idList.get(i);
             }
-
-            List<UserEntity> userList = userCenterClient.findUserIdsByUserIds(ids);
-            for (PlanManage plan : pages.getList()) {
-                for(UserEntity userEntity : userList){
-                    if(plan.getUserId() != null) {
-                        if(userEntity.getId()== Long.parseLong(plan.getUserId())){
-                            plan.setUserName(userEntity.getUsername());
-                        }
-                    }
-                    if(plan.getPlanUserId() != null){
-                        if(userEntity.getId()== Long.parseLong(plan.getPlanUserId())){
-                            plan.setPlanUserName(userEntity.getUsername());
-                        }
-                    }
-                    if(plan.getCreateBy() != null){
-                        if(userEntity.getId()== Long.parseLong(plan.getCreateBy())){
-                            plan.setCreateByName(userEntity.getUsername());
-                        }
-                    }
-//                    if(plan.getUpdateBy() != null) {
-//                        if(userEntity.getId()== Long.parseLong(plan.getUpdateBy())){
-//                            plan.setUpdateByName(userEntity.getUsername());
+//            List<UserEntity> userList = userCenterClient.findUserIdsByUserIds(ids);
+//            for (PlanManage plan : pages.getList()) {
+//                for(UserEntity userEntity : userList){
+//                    if(plan.getUserId() != null) {
+//                        if(userEntity.getId()== Long.parseLong(plan.getUserId())){
+//                            plan.setUserName(userEntity.getUsername());
 //                        }
 //                    }
-                }
-            }
+//                    if(plan.getPlanUserId() != null){
+//                        if(userEntity.getId()== Long.parseLong(plan.getPlanUserId())){
+//                            plan.setPlanUserName(userEntity.getUsername());
+//                        }
+//                    }
+//                    if(plan.getCreateBy() != null){
+//                        if(userEntity.getId()== Long.parseLong(plan.getCreateBy())){
+//                            plan.setCreateByName(userEntity.getUsername());
+//                        }
+//                    }
+////                    if(plan.getUpdateBy() != null) {
+////                        if(userEntity.getId()== Long.parseLong(plan.getUpdateBy())){
+////                            plan.setUpdateByName(userEntity.getUsername());
+////                        }
+////                    }
+//                }
+//            }
         }
     }
 }