diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java index 6a33b865..9ffbd6e0 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java @@ -271,9 +271,12 @@ public class CorePlatformService { /** * 是否允许注册 + * 该方法返回true/false 判断比较模糊,前端体验不好,建议使用{@link #isAllowUserCodeThrowMessage} + * * @param code * @return */ + @Deprecated public boolean isAllowUserCode(String code){ code = code.trim(); CoreUser coreUser = new CoreUser(); @@ -282,6 +285,25 @@ public class CorePlatformService { return !code.startsWith(ACCESS_SUPPER_ADMIN) && coreUserList.size() == 0; } + /** + * 是否允许注册, 并返回异常信息 + * @param code + * @return + */ + public void isAllowUserCodeThrowMessage(String code){ + code = code.trim(); + CoreUser coreUser = new CoreUser(); + coreUser.setCode(code); + List coreUserList = coreUserDao.template(coreUser); + if (code.startsWith(ACCESS_SUPPER_ADMIN)) { + throw new PlatformException("注册账号不允许admin开头:" + code); + } + + if (coreUserList != null && coreUserList.size() > 0) { + throw new PlatformException("注册的账号已存在:" + code); + } + } + public boolean isAllowUserCode(Long id,String code){ CoreUser coreUser = new CoreUser(); coreUser.setCode(code); diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java index 00cb62c4..428622e6 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java @@ -463,9 +463,7 @@ public class StudentService extends CoreBaseService{ this.save(student); String code = student.createCode(); - if (!platformService.isAllowUserCode(code)) { - throw new PlatformException("不允许的注册账号 " + code); - } + platformService.isAllowUserCodeThrowMessage(code); SchoolClass schoolClass = schoolClassService.queryById(student.getClassId()); Long orgId = schoolClass.getOrgId(); @@ -662,6 +660,7 @@ public class StudentService extends CoreBaseService{ String code = pojo.createCode();//TODO 可改规则 + // 这里不需要修改,该接口 已经丢弃。 if (!platformService.isAllowUserCode(code)) { delList.add(pojo.getStudentId()); // msg += "第"+(i+1)+"行不允许的注册账号 "+code+"
"; diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java index 196eba1c..c69f241f 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java @@ -231,9 +231,7 @@ public class TeacherService extends CoreBaseService { this.save(teacher); String code = teacher.createCode();//TODO 可改规则 - if (!platformService.isAllowUserCode(code)) { - throw new PlatformException("不允许的注册账号 " + code); - } + platformService.isAllowUserCodeThrowMessage(code); UniversitiesColleges universitiesColleges = universitiesCollegesService.queryById(teacher.getUniversitiesCollegesId()); Long orgId = universitiesColleges.getOrgId();