Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into 烟台-政务master

# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
#	epmet-user/epmet-user-server/src/main/resources/excel/ic_nat.xlsx

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.IdAndNameDTO;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.OrgTypeEnum;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
@@ -58,6 +59,7 @@ import com.epmet.dto.form.DetailByTypeFormDTO;
 import com.epmet.dto.form.GetStaffExistRoleFormDTO;
 import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.result.DetailByTypeResultDTO;
+import com.epmet.dto.form.GetStaffExistRoleFormDTO;
 import com.epmet.dto.result.NewUserRoleResultDTO;
 import com.epmet.dto.result.StaffRoleResultDTO;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
@@ -121,9 +123,9 @@ public class EpmetUserServiceImpl implements EpmetUserService {
     @Resource
     private IcPointNucleicMonitoringDao pointNucleicMonitoringDao;
     @Autowired
-    private GovAccessFeignClient govAccessFeignClient;
-    @Autowired
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
+    @Autowired
+    private GovAccessFeignClient govAccessFeignClient;
 
     /**
      * @Description  根据UserIds查询

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.PostConstruct;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -133,6 +134,7 @@ public class TagServiceImpl implements TagService {
         return tagRedis.getResiTag(formDto);
     }
 
+    @PostConstruct
 	@Override
     public Boolean initTag(InitTagFormDTO formDto) {
         List<TagCustomerEntity> customerTagList = tagCustomerDao.selectInitData(formDto.getCustomerIdList());