更新

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/org/impl/RoleDaoImpl.java

@@ -36,6 +36,9 @@ public class RoleDaoImpl extends BaseImpl implements RoleDaoExtend {
     @Override
     public Page<Role> page(Pageable pageable, RoleSearchParam param) {
         Criteria criteria = new Criteria();
+        if (StringUtils.isNotBlank(param.getOid())) {
+            criteria.and("oid").is(param.getOid());
+        }
 
         if (!CommonUtil.longIsEmpty(param.getStartTime()) && !CommonUtil.longIsEmpty(param.getEndTime())) {
             criteria.and("createTime").gte(param.getStartTime()).and("createTime").lte(param.getEndTime());

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/RoleService.java

@@ -172,6 +172,10 @@ public class RoleService extends SuperService {
      * @return
      */
     public ResultContent<Page<RoleModel>> page(RoleSearchParam param, Pageable pageable) {
+        if (StringUtils.isEmpty(param.getOid())) {
+            param.setOid(getCurrentOid());
+        }
+        Assert.hasText(param.getOid(), "oid为空");
         Page<Role> page = roleDao.page(pageable, param);
         return ResultContent.buildSuccess(PageEntityUtil.concurrent2PageModel(page, this::toModel));
     }