wangliang 3 anni fa
parent
commit
234ebf8986

+ 4 - 2
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -121,7 +121,9 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         }
         Set<Long> privilegeIds = sysRolePrivilegeList.stream().map(s -> s.getPrivilegeId()).collect(Collectors.toSet());
         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);
         Gson gson = new Gson();
         List<MenuDto> menuDtoList = gson.fromJson(JacksonUtil.parseJson(sysPrivilegeList), new TypeToken<List<MenuDto>>() {
@@ -896,7 +898,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
     }
 
     @Override
-    public String getSysIncrCode(SystemCodeEnum type,SysUser requestUser) {
+    public String getSysIncrCode(SystemCodeEnum type, SysUser requestUser) {
         Long schoolId = requestUser.getSchoolId();
         String date = DateUtil.today().replace("-", "");
         String paperNumber = "";