修复

1.ic用户导入 修复gridoption接口的适配问题

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java

@@ -564,7 +564,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 } else {
                     // remote类型
 
-                    Map<String, String> options = listRemoteOptions(headerColumnWrapper, columnWrapper.getOptionSourceValue(), currUserAgencyId);
+                    Map<String, String> options = listRemoteOptions(headerColumnWrapper, columnWrapper.getOptionSourceValue(), currUserAgencyId, "saveorupdate");
                     String colValue = options.get(cellContent);
                     columnWrapper.setColValue(colValue);
                 }
@@ -765,7 +765,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
      * @param fullUri
      * @return
      */
-    public Map<String, String> listRemoteOptions(Map<String, ColumnWrapper> columnWrappers, String fullUri, String currUserAgencyId) {
+    public Map<String, String> listRemoteOptions(Map<String, ColumnWrapper> columnWrappers, String fullUri, String currUserAgencyId, String purpose) {
         String pureUri = null;
         String cascadeItemId = null;
         ColumnWrapper cascadeItemColumnWrapper = null;
@@ -793,7 +793,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
             case "/gov/org/customergrid/gridoption":
                 GridOptionFormDTO form = new GridOptionFormDTO();
                 form.setAgencyId(currUserAgencyId);
-                form.setPurpose("saveorupdate");
+                form.setPurpose(purpose);
                 options = getResultDataOrThrowsException(govOrgOpenFeignClient.getGridOption(form), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
                 break;
             case "/gov/org/customerpartybranch/branchoption":

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

@@ -684,7 +684,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                             continue;
                         }
                         //todo 获取 options
-                        Map<String, String> stringMap = icResiUserImportService.listRemoteOptions(columnWrappers, v.getOptionSourceValue(), currentStaffAgencyId);
+                        Map<String, String> stringMap = icResiUserImportService.listRemoteOptions(columnWrappers, v.getOptionSourceValue(), currentStaffAgencyId, "query");
                         if ("checkbox".equals(v.getItemType())) {
                             stringMap.forEach((label, value) -> map.put(value, vauleStr.contains(value) ? "是" : "否"));
                         } else if ("select".equals(v.getItemType())) {