Merge branch 'dev'

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

@@ -222,7 +222,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         String loginUserClient = loginUserUtil.getLoginUserClient();
         String loginUserCustomerId = loginUserUtil.getLoginUserCustomerId();
 
-        log.info("userId:{}, app:{}, client:{}, customerId:{}", loginUserId, loginUserApp, loginUserClient, loginUserCustomerId);
+        log.info("importIcResiInfoFromExcel:: userId:{}, app:{}, client:{}, customerId:{}", loginUserId, loginUserApp, loginUserClient, loginUserCustomerId);
 
         //        LoginUserDetailsFormDTO userForm = new LoginUserDetailsFormDTO();
 //        userForm.setApp(loginUserApp);
@@ -234,7 +234,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 loginUserClient,
                 loginUserId).getAgencyId();
 
-        log.info("currUserAgencyId:{}", currUserAgencyId);
+        log.info("importIcResiInfoFromExcel:: currUserAgencyId:{}", currUserAgencyId);
 
         CustomerAgencyDTO agencyInfo = getResultDataOrThrowsException(govOrgOpenFeignClient.getAgencyById(currUserAgencyId), ServiceConstant.GOV_ORG_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null);
         String customerId = agencyInfo.getCustomerId();
@@ -369,6 +369,13 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private void importIcResiBaseInfoFromExcel(List<FormItemResult> formItemList, String excelPathName, int sheetNo, int headRowNumber, String currUserAgencyId, String currUserAgencyPids, String currentUserId,
                                                  String tableName, String customerId) {
 
+        String loginUserId = loginUserUtil.getLoginUserId();
+        String loginUserApp = loginUserUtil.getLoginUserApp();
+        String loginUserClient = loginUserUtil.getLoginUserClient();
+        String loginUserCustomerId = loginUserUtil.getLoginUserCustomerId();
+
+        log.info("importIcResiBaseInfoFromExcel:: userId:{}, app:{}, client:{}, customerId:{}", loginUserId, loginUserApp, loginUserClient, loginUserCustomerId);
+
         IcResiImportDynamicExcelListener readListener = new IcResiImportDynamicExcelListener(this, customerId, currentUserId, currUserAgencyId, currUserAgencyPids,
                 true, tableName, formItemList, headRowNumber);
         EasyExcel.read(new File(excelPathName)).registerReadListener(readListener).headRowNumber(headRowNumber).sheet(sheetNo).doRead();