[修改] 用户导入

adc-da-sys/src/main/java/com/adc/da/sys/service/UserEOServiceImpl.java

@@ -599,6 +599,7 @@ public class UserEOServiceImpl implements IUserEoService {
                 }
             }
             if (StringUtils.isNotEmpty(userImportVO.getOrgName())) {
+                userImportVO.setOrgName(userImportVO.getOrgName().replace("，", ","));
                 String[] split = userImportVO.getOrgName().split(",");
                 for (String s : split) {
                     OrgEO orgEO = orgEOMap.get(s);
@@ -616,6 +617,9 @@ public class UserEOServiceImpl implements IUserEoService {
 //            if (StringUtils.isEmpty(userImportVO.getIsUse())) {
 //                throw new AdcDaBaseException("第"+(i+1)+"行"+"是否启用不能为空");
 //            }
+            if (StringUtils.isEmpty(userImportVO.getRoleName())){
+                throw new AdcDaBaseException("第"+(i+1)+"行"+"角色：不能为空");
+            }
             if (!roleEOMap.keySet().contains(userImportVO.getRoleName())) {
                 throw new AdcDaBaseException("第"+(i+1)+"行"+"角色：" + userImportVO.getRoleName() + "不存在，请检查");
             }