Merge remote-tracking branch 'origin/dev_resi_export' into develop

# Conflicts: # epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
3 years ago · e764119bad
1 changed files with 1 additions and 1 deletions
--- 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
@ -688,7 +688,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
        if (CollectionUtils.isEmpty(demandCodePath)) {
            return StrConstant.EPMETY_STR;
        }
-        List<String> nameList = new ArrayList<>();
+        Set<String> nameList=new HashSet<>();
        for (String codePath : demandCodePath) {
            if (StringUtils.isNotBlank(codePath) && codePath.contains(StrConstant.COMMA)) {
                String[] codeAtt = codePath.split(StrConstant.COMMA);