Merge remote-tracking branch 'remotes/origin/develop' into release_temp

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -463,7 +463,7 @@ public interface GovOrgOpenFeignClient {
      * @Date 2021/10/26 14:02
      */
     @PostMapping("/gov/org/customergrid/gridoption")
-    Result<List<OptionResultDTO>> getGridOption(@RequestBody AgencyIdFormDTO formDTO);
+    Result<List<OptionResultDTO>> getGridOption(@RequestBody GridOptionFormDTO formDTO);
 
     /**
      * 获取网格下支部小组

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java

@@ -276,7 +276,7 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
     }
 
     @Override
-    public Result<List<OptionResultDTO>> getGridOption(AgencyIdFormDTO formDTO) {
+    public Result<List<OptionResultDTO>> getGridOption(GridOptionFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridOption", formDTO);
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -433,7 +433,7 @@ public class IcResiUserController {
         String serverIp = IpUtils.getServerIp();
         Object isChanged = redisUtils.hGet(RedisKeys.getResiTempChangedKey(customerId), serverIp);
         //如果 redis 不存在这个机器的key 或者值为1 则重新下载
-        if (isChanged == null || NumConstant.ONE_STR.equals(isChanged.toString())) {
+        if (!file.exists() || isChanged == null || NumConstant.ONE_STR.equals(isChanged.toString())) {
             if (file.exists()) {
                 file.delete();
             }

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

@@ -16,6 +16,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil;
 import com.epmet.dao.IcResiUserDao;
 import com.epmet.dto.*;
 import com.epmet.dto.form.AgencyIdFormDTO;
+import com.epmet.dto.form.GridOptionFormDTO;
 import com.epmet.dto.form.HouseFormDTO;
 import com.epmet.dto.form.LoginUserDetailsFormDTO;
 import com.epmet.dto.result.FormItemResult;
@@ -790,8 +791,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                         EpmetErrorCode.SERVER_ERROR.getCode(), null);
                 break;
             case "/gov/org/customergrid/gridoption":
-                AgencyIdFormDTO form = new AgencyIdFormDTO();
+                GridOptionFormDTO form = new GridOptionFormDTO();
                 form.setAgencyId(currUserAgencyId);
+                form.setPurpose("saveorupdate");
                 options = getResultDataOrThrowsException(govOrgOpenFeignClient.getGridOption(form), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null);
                 break;
             case "/gov/org/customerpartybranch/branchoption":