修改包

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/CommonResponse.java

-package com.yeejoin.amos.boot.module.jxiop.api.util;
+package com.yeejoin.amos.boot.module.hygf.api.util;
 
 
 import com.alibaba.fastjson.JSON;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/CommonResponseUtil.java

-package com.yeejoin.amos.boot.module.jxiop.api.util;
+package com.yeejoin.amos.boot.module.hygf.api.util;
 
 
+import com.yeejoin.amos.boot.module.jxiop.api.util.Constants;
 import org.springframework.http.HttpStatus;
 
 public class CommonResponseUtil

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/Constants.java

-package com.yeejoin.amos.boot.module.jxiop.api.util;
+package com.yeejoin.amos.boot.module.hygf.api.util;
 
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/DesUtil.java

-package com.yeejoin.precontrol.common.utils;
+package com.yeejoin.amos.boot.module.hygf.api.util;
 
 
 import java.util.ArrayList;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/FileUtil.java

-package com.yeejoin.amos.boot.module.jxiop.api.util;
+package com.yeejoin.amos.boot.module.hygf.api.util;
 
 import java.io.DataInputStream;
 import java.io.IOException;

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/util/HttpUtil.java

-package com.yeejoin.amos.boot.module.jxiop.api.util;
+package com.yeejoin.amos.boot.module.hygf.api.util;
 
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpStatus;

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

@@ -564,7 +564,7 @@ public class UnitInfoController extends BaseController {
         Collection<GroupModel> children =  feignClientResult.getResult();
         Collection<GroupModel> chil =new ArrayList<>();
         for (GroupModel child : children) {
-            if("户用光伏-经销商".equals(child.getGroupName())||"用户光伏-微信农户".equals(child.getGroupName())){
+            if("户用光伏-经销商".equals(child.getGroupName())||"用户光伏-农户".equals(child.getGroupName())){
             //排除其余角色
             }else{
                 chil.add(child);
@@ -574,9 +574,27 @@ public class UnitInfoController extends BaseController {
     }
 
 
+    //根据角色获取区域公司
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getRegionalCompanies")
+    @ApiOperation(httpMethod = "GET", value = "根据角色获取区域公司", notes = "根据角色获取区域公司")
+    public ResponseModel<Collection<GroupModel>> getRegionalCompanies() {
+
+        String  userid= getUserInfo().getUserId();
+
+        //如果是管理端
+
+
 
+        //如果是经销商管理员
 
 
 
+        //如果是经销商普通员工
+
+
+    }
+
+
 
 }