diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java index 75d570f7..cfc06409 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java @@ -88,6 +88,9 @@ public class CoreUserService extends CoreBaseService { Assert.notNull(jobType0, "岗位不能为空!"); Assert.notNull(jobType1, "岗位子类型不能为空!"); + Boolean length = userCode.length() <= 16; + Assert.isTrue(length, "输入内容:"+userCode+ " 超过16个字符!"); + // 判断用户Code唯一 Boolean isNotExist = coreUserDao.createLambdaQuery().andEq(CoreUser::getCode,userCode).count() == 0; Assert.isTrue(isNotExist, "用户名重复!"); diff --git a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java index 55192b12..9ab5d019 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java @@ -346,11 +346,12 @@ public class CourseInfoController { condition.setCourseInfoType(1);//类型(1课程 2章 3节) PageQuery page = condition.getPageQuery(); page.setOrderBy("add_time desc"); - if (coreUser.isAdmin()){ - courseInfoService.getCourseDispositionSystemOAndUniversities(page); - }else { - courseInfoService.queryByCondition(page); - } +// if (coreUser.isAdmin()){ +// courseInfoService.getCourseDispositionSystemOAndUniversities(page); +// }else { +// courseInfoService.queryByCondition(page); +// } + courseInfoService.queryByCondition(page); return JsonResult.success(page); }