【7.6.0】【sys】【role】整理获取分页列表

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/SysRoleController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import java.util.List;
 
 /**
  * 系统角色控制器
@@ -76,17 +75,6 @@ public class SysRoleController {
         return new SuccessResponseData<>(sysRoleService.detail(sysRoleRequest));
     }
 
-    /**
-     * 获取列表
-     *
-     * @author fengshuonan
-     * @date 2023/06/10 21:29
-     */
-    @GetResource(name = "获取列表", path = "/sysRole/list")
-    public ResponseData<List<SysRole>> list(SysRoleRequest sysRoleRequest) {
-        return new SuccessResponseData<>(sysRoleService.findList(sysRoleRequest));
-    }
-
     /**
      * 获取列表（带分页）
      *

kernel-s-sys/sys-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
 import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
+import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity;
 import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import cn.stylefeng.roses.kernel.sys.modular.role.entity.SysRole;
@@ -16,7 +17,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -56,6 +56,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Override
     public PageResult<SysRole> findPage(SysRoleRequest sysRoleRequest) {
         LambdaQueryWrapper<SysRole> wrapper = createWrapper(sysRoleRequest);
+
+        // 只查询需要的字段
+        wrapper.select(SysRole::getRoleName, SysRole::getRoleCode, SysRole::getRoleSort, SysRole::getRoleId, BaseEntity::getCreateTime);
+
         Page<SysRole> sysRolePage = this.page(PageFactory.defaultPage(), wrapper);
         return PageResultFactory.createPageResult(sysRolePage);
     }
@@ -89,31 +93,15 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     private LambdaQueryWrapper<SysRole> createWrapper(SysRoleRequest sysRoleRequest) {
         LambdaQueryWrapper<SysRole> queryWrapper = new LambdaQueryWrapper<>();
 
-        Long roleId = sysRoleRequest.getRoleId();
+        // 根据名称模糊搜索
-        String roleName = sysRoleRequest.getRoleName();
+        String searchText = sysRoleRequest.getSearchText();
-        String roleCode = sysRoleRequest.getRoleCode();
+        if (ObjectUtil.isNotEmpty(searchText)) {
-        BigDecimal roleSort = sysRoleRequest.getRoleSort();
+            queryWrapper.like(SysRole::getRoleName, searchText);
-        Integer dataScopeType = sysRoleRequest.getDataScopeType();
+            queryWrapper.or().like(SysRole::getRoleCode, searchText);
-        Integer statusFlag = sysRoleRequest.getStatusFlag();
+        }
-        String remark = sysRoleRequest.getRemark();
-        String roleSystemFlag = sysRoleRequest.getRoleSystemFlag();
-        String expandField = sysRoleRequest.getExpandField();
-        Long versionFlag = sysRoleRequest.getVersionFlag();
-        String delFlag = sysRoleRequest.getDelFlag();
-        Long tenantId = sysRoleRequest.getTenantId();
 
-        queryWrapper.eq(ObjectUtil.isNotNull(roleId), SysRole::getRoleId, roleId);
+        // 排序字段
-        queryWrapper.like(ObjectUtil.isNotEmpty(roleName), SysRole::getRoleName, roleName);
+        queryWrapper.orderByAsc(SysRole::getRoleSort);
-        queryWrapper.like(ObjectUtil.isNotEmpty(roleCode), SysRole::getRoleCode, roleCode);
-        queryWrapper.eq(ObjectUtil.isNotNull(roleSort), SysRole::getRoleSort, roleSort);
-        queryWrapper.eq(ObjectUtil.isNotNull(dataScopeType), SysRole::getDataScopeType, dataScopeType);
-        queryWrapper.eq(ObjectUtil.isNotNull(statusFlag), SysRole::getStatusFlag, statusFlag);
-        queryWrapper.like(ObjectUtil.isNotEmpty(remark), SysRole::getRemark, remark);
-        queryWrapper.like(ObjectUtil.isNotEmpty(roleSystemFlag), SysRole::getRoleSystemFlag, roleSystemFlag);
-        queryWrapper.like(ObjectUtil.isNotEmpty(expandField), SysRole::getExpandField, expandField);
-        queryWrapper.eq(ObjectUtil.isNotNull(versionFlag), SysRole::getVersionFlag, versionFlag);
-        queryWrapper.like(ObjectUtil.isNotEmpty(delFlag), SysRole::getDelFlag, delFlag);
-        queryWrapper.eq(ObjectUtil.isNotNull(tenantId), SysRole::getTenantId, tenantId);
 
         return queryWrapper;
     }