Merge branch 'master' into lixuetao

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

@@ -584,7 +584,9 @@ public class UserEOServiceImpl implements IUserEoService {
                 throw new AdcDaBaseException("第"+(i+1)+"行"+"用户名不符合规则");
             }
             if (StringUtils.isNotBlank(userImportVO.getEmail())) {
-//                if (!(userImportVO.getEmail().matches("^[\\w-.]+@[a-z\\d-]+(\\.[a-z\\d-]+)*\\.[a-z\\d]{2,6}$/i"))) {
+                if (userImportVO.getEmail().length() > 50 ) {
+                    throw new AdcDaBaseException("第"+(i+1)+"行"+"邮箱长度不能超过50");
+                }
                 if (!(userImportVO.getEmail().matches("^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$"))) {
                     throw new AdcDaBaseException("第"+(i+1)+"行"+"邮箱不符合规则！");
                 }
@@ -604,7 +606,7 @@ public class UserEOServiceImpl implements IUserEoService {
                         throw new AdcDaBaseException("第"+(i+1)+"行"+s+"部门不存在");
                     }else {
                         userImportVO.setOrgId(StringUtils.isEmpty(userImportVO.getOrgId()) ? orgEO.getId()
-                                : "," + orgEO.getId());
+                                :userImportVO.getOrgId() + "," + orgEO.getId());
                     }
                 }
             }