|
@@ -121,7 +121,9 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
|
|
}
|
|
}
|
|
Set<Long> privilegeIds = sysRolePrivilegeList.stream().map(s -> s.getPrivilegeId()).collect(Collectors.toSet());
|
|
Set<Long> privilegeIds = sysRolePrivilegeList.stream().map(s -> s.getPrivilegeId()).collect(Collectors.toSet());
|
|
QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<SysPrivilege> sysPrivilegeQueryWrapper = new QueryWrapper<>();
|
|
- sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds).eq(SysPrivilege::getEnable, true).eq(SysPrivilege::getFrontDisplay, true);
|
|
|
|
|
|
+ sysPrivilegeQueryWrapper.lambda().in(SysPrivilege::getId, privilegeIds)
|
|
|
|
+ .eq(SysPrivilege::getEnable, true).eq(SysPrivilege::getFrontDisplay, true)
|
|
|
|
+ .orderByAsc(SysPrivilege::getSequence);
|
|
List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
|
|
List<SysPrivilege> sysPrivilegeList = sysPrivilegeService.list(sysPrivilegeQueryWrapper);
|
|
Gson gson = new Gson();
|
|
Gson gson = new Gson();
|
|
List<MenuDto> menuDtoList = gson.fromJson(JacksonUtil.parseJson(sysPrivilegeList), new TypeToken<List<MenuDto>>() {
|
|
List<MenuDto> menuDtoList = gson.fromJson(JacksonUtil.parseJson(sysPrivilegeList), new TypeToken<List<MenuDto>>() {
|
|
@@ -896,7 +898,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public String getSysIncrCode(SystemCodeEnum type,SysUser requestUser) {
|
|
|
|
|
|
+ public String getSysIncrCode(SystemCodeEnum type, SysUser requestUser) {
|
|
Long schoolId = requestUser.getSchoolId();
|
|
Long schoolId = requestUser.getSchoolId();
|
|
String date = DateUtil.today().replace("-", "");
|
|
String date = DateUtil.today().replace("-", "");
|
|
String paperNumber = "";
|
|
String paperNumber = "";
|