Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

4 years ago · 11718139e8
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
@ -641,7 +641,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
        }
        List<String> nameList=new ArrayList<>();
        for(String codePath:demandCodePath){
-            if(codePath.contains(StrConstant.COMMA)){
+            if (StringUtils.isNotBlank(codePath) && codePath.contains(StrConstant.COMMA)) {
                String[] codeAtt=codePath.split(StrConstant.COMMA);
                String code=codeAtt[codeAtt.length-1];
                if(StringUtils.isNotBlank(code)&&demandDictMap.containsKey(code)){