1.修改获取区域公司与经销商的接口返回。

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

@@ -364,11 +364,18 @@ public class JpStationController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "查询当前登录人权限区域公司",   notes = "查询当前登录人权限区域公司")
     @GetMapping(value = "/getRegion")
     @UserLimits
-    public ResponseModel< List<DropDown>> getRegion() {
+    public ResponseModel<List<Map<String,String>>> getRegion() {
 
         List<DropDown>  list=  jpStationMapper.getRegion();
-
-         return ResponseHelper.buildResponse(list);
+        List<Map<String,String>> result = new ArrayList<>();
+        list.forEach(dropDown -> {
+            Map<String,String> item = new HashMap<>();
+            item.put("name",dropDown.getName());
+            item.put("value",dropDown.getOrgCode());
+            result.add(item);
+        });
+
+         return ResponseHelper.buildResponse(result);
     }
 
 
@@ -377,9 +384,16 @@ public class JpStationController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "查询当前登录人权限经销商",   notes = "查询当前登录人权限经销商")
     @GetMapping(value = "/getDealer")
     @UserLimits
-    public ResponseModel<List<DropDown>> getDealer(String regionalCompaniesCode ) {
+    public ResponseModel<List<Map<String,String>>> getDealer(String regionalCompaniesCode ) {
         List<DropDown>  list=  jpStationMapper.getDealer(regionalCompaniesCode);
-        return ResponseHelper.buildResponse(list);
+        List<Map<String,String>> result = new ArrayList<>();
+        list.forEach(dropDown -> {
+            Map<String,String> item = new HashMap<>();
+            item.put("name",dropDown.getName());
+            item.put("value",dropDown.getOrgCode());
+            result.add(item);
+        });
+        return ResponseHelper.buildResponse(result);
     }
 
    //电站发电量统计