queryinfo报错

blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/feign/WbsTreeContractClient.java

@@ -181,6 +181,6 @@ public interface WbsTreeContractClient {
 
 
     //获取 节点下表单
-    @GetMapping(API_PREFIX + "/searchNodeAllTable")
-    List<AppWbsTreeContractVO> searchNodeAllTable(String primaryKeyId, String type, String contractId, String projectId);
+    @GetMapping(API_PREFIX + "/searchNodeAllTableInfo")
+    List<AppWbsTreeContractVO> searchNodeAllTableInfo(@RequestParam String primaryKeyId, @RequestParam String type, @RequestParam String contractId, @RequestParam String projectId);
 }

blade-service/blade-business/src/main/java/org/springblade/business/service/impl/TaskServiceImpl.java

@@ -980,7 +980,7 @@ public class TaskServiceImpl extends BaseServiceImpl<TaskMapper, Task> implement
                 //获取
                 String dateInfo = "";
                 InformationQuery queryinfo = informationQueryService.getById(iId);
-                List<AppWbsTreeContractVO> WbsTreeContract = wbsTreeContractClient.searchNodeAllTable(queryinfo.getWbsId() + "", queryinfo.getClassify() + "", queryinfo.getContractId() + "", queryinfo.getProjectId() + "");
+                List<AppWbsTreeContractVO> WbsTreeContract = wbsTreeContractClient.searchNodeAllTableInfo(queryinfo.getWbsId() + "", queryinfo.getClassify() + "", queryinfo.getContractId() + "", queryinfo.getProjectId() + "");
                 List<String> collect = new ArrayList<>();
                 Map<String,String> idMap = new HashMap<>();
                 for(AppWbsTreeContractVO appWbsTreeContractVO : WbsTreeContract){

blade-service/blade-control/src/main/java/org/springblade/control/wrapper/UserFilesWrapper.java

@@ -60,8 +60,6 @@ public class UserFilesWrapper extends BaseEntityWrapper<UserFilesInfoVO, UserFil
         userFilesInfo.setUserTypeName(DictCache.getValue("user_type", userFilesInfo.getUserType()));
         userFilesInfo.setConTypeName(DictCache.getValue("con_type", userFilesInfo.getConType()));
         userFilesInfo.setUserStatusName(DictCache.getValue("user_status", userFilesInfo.getUserStatus()));
-        List<Dict> userStatus = DictCache.getList("user_status");
-        System.out.println(userStatus);
         userFilesInfo.setPoliticalName(DictCache.getValue("political_type", userFilesInfo.getPolitical()));
         return userFilesInfo;
     }

blade-service/blade-manager/src/main/java/org/springblade/manager/feign/WbsTreeContractClientImpl.java

@@ -420,7 +420,7 @@ public class WbsTreeContractClientImpl implements WbsTreeContractClient {
     }
 
     @Override
-    public List<AppWbsTreeContractVO> searchNodeAllTable(String primaryKeyId, String type, String contractId, String projectId) {
+    public List<AppWbsTreeContractVO> searchNodeAllTableInfo(String primaryKeyId, String type, String contractId, String projectId) {
         List<AppWbsTreeContractVO> list = wbsTreeContractService.searchNodeAllTable(primaryKeyId, type, contractId, projectId);
         return list;
     }

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -166,7 +166,7 @@ public class UserController {
     public R submit(@Valid @RequestBody UserDTO user) {
         CacheUtil.clear(USER_CACHE);
         // 内控系统拆分
-        List<DeptUserVO> deptList = user.getDeptList();
+/*        List<DeptUserVO> deptList = user.getDeptList();
         if (deptList != null && deptList.size() >= 1) {
             user.setRoleId(JSON.toJSONString(deptList));
             String deptId = "";
@@ -192,7 +192,7 @@ public class UserController {
             user.setDeptId(deptId);
             user.setRoleId(postId);
             user.setIsLeader(isLaderpostId);
-        }
+        }*/
 
 
         return R.status(userService.submit(user));
@@ -219,7 +219,7 @@ public class UserController {
     public R update(@Valid @RequestBody UserDTO user) {
         CacheUtil.clear(USER_CACHE);
         // 内控系统拆分
-        List<DeptUserVO> deptList = user.getDeptList();
+/*        List<DeptUserVO> deptList = user.getDeptList();
         if (deptList != null && deptList.size() >= 1) {
             String deptId = "";
             String postId = "";
@@ -245,7 +245,7 @@ public class UserController {
             user.setDeptId(deptId);
             user.setRoleId(postId);
             user.setDeptInfo(JSONArray.toJSONString(deptList));
-        }
+        }*/
         return R.status(userService.updateUser(user));
     }
 

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -32,7 +32,7 @@
         <result column="acc_code" property="accCode"/>
         <result column="sys_id" property="sysId"/>
         <result column="sys_type" property="sysType"/>
-        <result column="is_lader" property="isLeader"/>
+        <result column="is_leader" property="isLeader"/>
         <result column="one_money" property="oneMoney"/>
         <result column="dept_info" property="deptInfo"/>
     </resultMap>