场站管理场站所属片区与左侧树联动

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PrivilegeController.java

@@ -59,30 +59,49 @@ public class PrivilegeController extends BaseController{
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/subcompany")
     @ApiOperation(httpMethod = "GET",value = "查询单位、子单位",  notes = "查询单位、子单位")
-    public ResponseModel< List<ListCompanyModel>> subcompany() {
-        //获取当前登录人单位
+    public ResponseModel< Collection<CompanyModel>> subcompany(String orgCode) {
+        Long companyId =null;
+        if(orgCode!=null){
+
+            LinkedHashMap<Object, Object> l = (LinkedHashMap<Object, Object>) Privilege.companyClient
+                    .queryByOrgcode(orgCode).getResult();
+            for (Map.Entry<Object, Object> it : l.entrySet()) {
+
+                CompanyModel companyModel = JSONObject.parseObject(JSONObject.toJSONString(it.getValue()),
+                        CompanyModel.class);
+                if (companyModel != null) {
+                    companyId = companyModel.getSequenceNbr();
+                }
+                break;
+            }
+
+        }else{
             ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        Long  companyId=reginParams.getCompany().getSequenceNbr();
-        List<ListCompanyModel >  date=new ArrayList();
-        if("area".equals(reginParams.getCompany().getLevel())){
-            ListCompanyModel companyModel=new ListCompanyModel();
-            companyModel.setSequenceNbr(companyId);
-            companyModel.setCompanyName(reginParams.getCompany().getCompanyName());
-            date.add(companyModel);
-        }else if("headquarter".equals(reginParams.getCompany().getLevel())){
-            FeignClientResult<Collection<CompanyModel>> de =Privilege.companyClient.querySubAgencyTree(companyId);
-            Collection<CompanyModel> dated= de.getResult();
-
-            for (CompanyModel companyModel : dated) {
-                if("area".equals(companyModel.getLevel())){
-                    ListCompanyModel companyModeld=new ListCompanyModel();
-                    companyModeld.setSequenceNbr(companyModel.getSequenceNbr());
-                    companyModeld.setCompanyName(companyModel.getCompanyName());
-                    date.add(companyModeld);
+            companyId = reginParams.getCompany().getSequenceNbr();
+        }
+        //获取当前登录人单位
+        List<ListCompanyModel> data = new ArrayList();
+        FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(companyId);
+        FeignClientResult<CompanyModel> dat = Privilege.companyClient.seleteOne(companyId);
+        CompanyModel  companyModel=dat.getResult();
+        List<CompanyModel> list =new ArrayList<>();
+        //如果是公司则获取所有片区
+        if(companyModel.getLevel().equals("headquarter")){
+            Collection<CompanyModel> companyModelList= de.getResult();
+            companyModelList.parallelStream().forEach((companyModel1)->{companyModel1.setChildren(new ArrayList());});
+            return ResponseHelper.buildResponse(companyModelList);
         }
+        //如果是片区则获取片区
+        if(companyModel.getLevel().equals("area")){
+            list.add(companyModel);
+            return ResponseHelper.buildResponse(list);
         }
+        //如果是场站获取片区
+        if(companyModel.getLevel().equals("station")){
+            FeignClientResult<CompanyModel> areaInfo = Privilege.companyClient.seleteOne(companyModel.getParentId());
+            list.add(areaInfo.getResult());
         }
-        return ResponseHelper.buildResponse(date);
+        return ResponseHelper.buildResponse(list);
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)