TRX 1 yıl önce
ebeveyn
işleme
b65363db77

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/RoleService.java

@@ -52,6 +52,7 @@ public class RoleService extends SuperService {
         if (StringUtils.isEmpty(oid)) {
             oid = getCurrentOid();
         }
+        Assert.hasText(oid, "oid不能为空");
         param.setOid(oid);
         if (param.getSort() == null) {
             param.setSort(1L);
@@ -176,8 +177,8 @@ public class RoleService extends SuperService {
             param.setOid(getCurrentOid());
         }
         Assert.hasText(param.getOid(), "oid为空");
-        Page<Role> page = roleDao.page(pageable, param);
         param.setIsSortDesc(Boolean.FALSE);
+        Page<Role> page = roleDao.page(pageable, param);
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
     }