修改通讯录查询列表接口、修改工商信息接口

amos-boot-system-tzs/amos-boot-module-tzs-api/src/main/java/com/yeejoin/amos/boot/module/tzs/flc/api/feign/AccessFeignService.java

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 //@FeignClient(url="http://172.16.3.34:11005",name = "AMOS-API-ACCESSAPI-ZYB", path = "/accessapi" )
-@FeignClient(name = "AMOS-API-ACCESSAPI-ZYB", path = "/accessapi" )
+@FeignClient(name = "AMOS-API-ACCESSAPI", path = "/accessapi" )
 public interface AccessFeignService {
 
     /**

amos-boot-system-tzs/amos-boot-module-tzs-biz/src/main/java/com/yeejoin/amos/boot/module/tzs/biz/controller/InspectionController.java

 package com.yeejoin.amos.boot.module.tzs.biz.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.module.tzs.flc.api.dto.BizRecordCount;
@@ -8,6 +9,7 @@ import com.yeejoin.amos.boot.module.tzs.flc.api.feign.IdxFeignService;
 import com.yeejoin.amos.boot.module.tzs.flc.api.service.InspectionService;
 import com.yeejoin.amos.component.feign.model.Page;
 import com.yeejoin.amos.feign.privilege.Privilege;
+import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,8 +20,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.List;
-import java.util.Map;
+import java.util.*;
 
 @RestController
 @RequestMapping("/Inspection")
@@ -131,14 +132,29 @@ public class InspectionController {
             @RequestParam int current,
             @RequestParam int size
     ) {
-        List<String> ids = null;
+        List<String> ids = new ArrayList<>();
         if (StringUtils.hasText(selectValue)) {
-            ids = idxFeignService.getTreeChildIds(dimensionTableId, selectValue).getResult();
+            Collection<CompanyModel> a  = Privilege.companyClient.querySubAgencyTree(Long.valueOf(selectValue)).getResult();
+            ids = recursion(a,ids);
         }
         Page result = Privilege.agencyUserClient.queryForPage(null, realName, mobile, null, current, size, ids).getResult();
         return ResponseHelper.buildResponse(result);
     }
 
+    public List recursion(Collection feign,List ids){
+        if(feign == null){
+            return ids;
+        }
+        Iterator iter = feign.iterator();
+        while(iter.hasNext()){
+            String json = JSON.toJSONString(iter.next());
+            CompanyModel companyModel =  JSON.parseObject(json,CompanyModel.class);
+            ids.add(String.valueOf(companyModel.getSequenceNbr()));
+            recursion(companyModel.getChildren(),ids);
+        }
+        return ids;
+    }
+
     @GetMapping("/getMapByRegion/{regionSeq}")
     @ApiOperation(value = "获取下级行政区划下的所有数据")
     @TycloudOperation(ApiLevel = UserType.AGENCY)