机构查询修改

user_center/src/main/java/com/huaxu/controller/OrgController.java

@@ -127,9 +127,10 @@ public class OrgController {
     @ApiOperation(value = "获取机构树")
     public AjaxMessage<List<OrgTree>> getOrgUserTree(@ApiParam(value = "机构类型", required = true)
 
-                                                 @RequestParam  String orgType) {
+                                                 @RequestParam  String orgType, @RequestParam  Integer id) {
         Org org=new Org();
         org.setOrgType(orgType);
+        org.setId(id);
 
         return new AjaxMessage<>(ResultStatus.OK, orgService.getUserTrees(org));
     }

user_center/src/main/java/com/huaxu/service/impl/OrgServiceImpl.java

@@ -8,6 +8,7 @@ import com.huaxu.model.LoginUser;
 import com.huaxu.model.ProgramItem;
 import com.huaxu.service.OrgService;
 import com.huaxu.util.UserUtil;
+import io.swagger.models.auth.In;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -194,6 +195,8 @@ public class OrgServiceImpl implements OrgService {
     public List<OrgTree> getUserTrees(Org org) {
         LoginUser currentUser = UserUtil.getCurrentUser();
         org.setTenantId(currentUser.getTenantId());
+        Integer id=org.getId();
+        org.setId(null);
        /* Set<Integer>orgIds=new HashSet<>();
         List<ProgramItem> programItemList = currentUser.getProgramItemList();
         if(programItemList!=null){
@@ -204,6 +207,7 @@ public class OrgServiceImpl implements OrgService {
 
         List<OrgTree> trees=new ArrayList<>();
         if("company".equals(org.getOrgType())){
+
             if(currentUser.getDepartmentId()==null){
                 trees=orgMapper.selectTrees(org);
                 trees=getOrgTreeByOrg(trees,currentUser.getCompanyId());
@@ -216,6 +220,12 @@ public class OrgServiceImpl implements OrgService {
                 org.setOrgType("department");
                 trees=orgMapper.selectTrees(org);
                 trees=getOrgTreeByOrg(trees,currentUser.getDepartmentId());
+            }else{
+
+
+                trees=orgMapper.selectTrees(org);
+                trees=getOrgTree(trees,id,1);
+
             }
 
         }