|
@@ -7,6 +7,7 @@ import java.util.Arrays;
|
|
|
import java.util.HashSet;
|
|
|
import java.util.List;
|
|
|
import java.util.Set;
|
|
|
+import java.util.regex.Pattern;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
import org.apache.commons.collections4.CollectionUtils;
|
|
@@ -49,6 +50,7 @@ import cn.com.qmth.mps.vo.user.UserVo;
|
|
|
@Service
|
|
|
public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements UserService {
|
|
|
private static final String DEFAULT_PASSWD = "123456";
|
|
|
+ private static Pattern numberRex = Pattern.compile("^1[0-9]{10}$");
|
|
|
|
|
|
@Autowired
|
|
|
private UserCourseRelationService userCourseRelationService;
|
|
@@ -178,6 +180,13 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
|
|
|
|
|
|
impuser.setRole(Role.getByName(role));
|
|
|
|
|
|
+ if (Role.SECTION_LEADER.equals(impuser.getRole()) && StringUtils.isNotBlank(impuser.getLoginName())) {
|
|
|
+ if (!numberRex.matcher(impuser.getLoginName()).find()) {
|
|
|
+ msg.append(" 科组长登录名必须为手机号");
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
String coursecodes = trimAndNullIfBlank(line.getValue(3));
|
|
|
if (StringUtils.isNotBlank(coursecodes)) {
|
|
|
impuser.setCourse(Arrays.asList(coursecodes.split(",")));
|