From 57c279de57b7ea05f2dffa6df0ef300f033ce915 Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Thu, 18 Nov 2021 13:43:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=201.ic=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=20=E4=BF=AE=E5=A4=8Dgridoption=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E7=9A=84=E9=80=82=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/IcResiUserImportServiceImpl.java | 6 +++---
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 48c0cf7a5b..909f16b8ad 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/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":
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index c97cdbabdd..eb62c090af 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/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())) {