ariesy 新增需求 v2:

1.根据报错信息返回提示语
2.组织管理列表需求根据当前登录的用户选择的企业筛选

dxhy-admin/src/main/java/com/dxhy/admin/sys/controller/SysDeptController.java

@@ -45,7 +45,13 @@ public class SysDeptController extends AbstractController {
      * 列表
      */
     @RequestMapping("/list")
-    public ResponseEntity<?> list(@RequestBody long deptId) {
+    public ResponseEntity<?> list(@RequestBody Map<String, String> pramsMap) {
+        long deptId = 0;
+        if(StringUtils.isNotEmpty(pramsMap.get("deptId"))) {
+            deptId = Long.parseLong(pramsMap.get("deptId"));
+        }else{
+            deptId = -1;
+        }
         String company = "";
         UserInfo userInfo = getUserInfo();
         if (Long.parseLong(getUserId()) != Constant.SUPER_ADMIN && !userInfo.getCompany().contains(SysConfig.ZXQY)) {

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysDeptServiceImpl.java

@@ -58,6 +58,17 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptDao, SysDeptEntity> i
     public List<SysDeptEntity> queryList(String company, long parentId) {
         DynamicContextHolder.push(DbConstant.BASICS_READ);
         List<SysDeptEntity> deptList = baseMapper.queryList(company);
+        if(parentId == -1){
+            parentId = 0;
+            if (StringUtils.isNotBlank(company)) {
+                for (SysDeptEntity deptEntity : deptList) {
+                    if ("1".equals(deptEntity.getDeptType())) {
+                        parentId = deptEntity.getParentId();
+                        break;
+                    }
+                }
+            }
+        }
         return this.getChildPerms(deptList, parentId);
     }