Browse Source

增加顶级机构

hym 4 years ago
parent
commit
2ff22cf69c

+ 1 - 1
user_center/src/main/java/com/huaxu/controller/OrgController.java

@@ -100,7 +100,7 @@ public class OrgController {
      */
     @RequestMapping(value = "getOrgTree", method = RequestMethod.POST)
     @ApiOperation(value = "获取机构树")
-    public AjaxMessage<List<OrgTree>> getOrgTree(@ApiParam(value = "机构类型", required = true)
+    public AjaxMessage<OrgTree> getOrgTree(@ApiParam(value = "机构类型", required = true)
 
                                                              @RequestParam  String orgType) {
         Org org=new Org();

+ 1 - 1
user_center/src/main/java/com/huaxu/service/OrgService.java

@@ -86,5 +86,5 @@ public interface OrgService {
     int count();
 
     IPage<Org> selectPage(Org org, IPage<Org> page);
-    List<OrgTree>getTrees(Org org);
+    OrgTree getTrees(Org org);
 }

+ 6 - 2
user_center/src/main/java/com/huaxu/service/impl/OrgServiceImpl.java

@@ -172,7 +172,7 @@ public class OrgServiceImpl implements OrgService {
     }
 
     @Override
-    public List<OrgTree> getTrees(Org org) {
+    public OrgTree getTrees(Org org) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         org.setTenantId(currentUser.getTenantId());
         Set<Integer>orgIds=new HashSet<>();
@@ -185,7 +185,11 @@ public class OrgServiceImpl implements OrgService {
         List<OrgTree> trees=orgMapper.selectTrees(org);
 
         trees=getOrgTree(trees,0,1,orgIds);
-        return trees;
+        OrgTree orgTree=new OrgTree();
+        orgTree.setOrgs(trees);
+        orgTree.setOrgName("组织机构");
+        orgTree.setId(-1);
+        return orgTree;
     }
     public static List<OrgTree> getOrgTree(List<OrgTree> list, Integer id, Integer level, Set<Integer> set) {
         List<OrgTree> temList = newArrayList();