修改bug

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

@@ -26,9 +26,7 @@ import org.typroject.tyboot.core.restful.doc.TycloudOperation;
 import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -90,23 +88,50 @@ public class PrivilegeController extends BaseController{
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/stationTree")
     @ApiOperation(httpMethod = "GET",value = "查询所属场站",  notes = "查询所属场站")
-    public ResponseModel< List<ListCompanyModel>> stationTree() {
-        ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
-        Long companyId = reginParams.getCompany().getSequenceNbr();
-        List<ListCompanyModel> data = new ArrayList();
-            FeignClientResult<Collection<CompanyModel>> de = Privilege.companyClient.querySubAgencyTree(companyId);
-            Collection<CompanyModel> datas = de.getResult();
-            for (CompanyModel companyModel : datas) {
-                if ("area".equals(companyModel.getLevel())) {
-                    ListCompanyModel companyModeld = new ListCompanyModel();
-                    companyModeld.setSequenceNbr(companyModel.getSequenceNbr());
-                    companyModeld.setCompanyName(companyModel.getCompanyName());
-                    companyModeld.setDisabled(true);
-                    companyModeld.setChildren(companyModel.getChildren());
-                    data.add(companyModeld);
+    public ResponseModel<  Collection<CompanyModel>> stationTree(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;
             }
-        return ResponseHelper.buildResponse(data);
+
+        }else{
+            ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+            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();
+          companyModel.setChildren(de.getResult());
+        List<CompanyModel> list =new ArrayList<>();
+        list.add(companyModel);
+        return ResponseHelper.buildResponse(list);
     }
 
+
+//    public List<ListCompanyModel> getdata(Collection<CompanyModel> datas){
+//        List<ListCompanyModel> list =new ArrayList<>();
+//        for (CompanyModel companyModel : datas) {
+//            ListCompanyModel companyModeld = new ListCompanyModel();
+//            companyModeld.setSequenceNbr(companyModel.getSequenceNbr());
+//            companyModeld.setCompanyName(companyModel.getCompanyName());
+//            companyModeld.setChildren(getdata(companyModel.getChildren()));
+//            list.add(companyModeld);
+//        }
+//        return list;
+//    }
+
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -243,6 +243,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         wrapper1.eq("is_delete", 0);
         //人员基础信息
         PersonBasic personBasic = this.getOne(wrapper1);
+
+
         BeanUtils.copyProperties(personBasic,personUser);
 
 
@@ -263,6 +265,10 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto,PersonBas
         wrapper4.eq("person_id", sequenceNbr);
         //人员账号信息
         PersonAccount personAccount= personAccountService.getOne(wrapper4);
+
+        if(personBasic.getNativePlace()!=null){
+            personUser.setNativePlace(JSON.parseArray(personBasic.getNativePlace(),Integer.class));
+        }
         personDto.setPersonUser(personUser);
         personDto.setPersonCertificate(personCertificate);
         personDto.setPersonAccount(personAccount);