WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-06-11 13:32:37 +08:00
parent d9e69f1d5c 4a81fc66bd
commit e9d2db2e2a
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java
+4 -1
View File
@@ -115,7 +115,10 @@ public class SysCategoryController {
@PostMapping(value = "/queryPageList") @PostMapping(value = "/queryPageList")
// @RequiresPermissions("sys:category:queryPageList") // @RequiresPermissions("sys:category:queryPageList")
public Result<?> queryPageList(@RequestBody Map<String,Object> params) { public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
IPage<SysCategory> pageList= sysCategoryService.queryPageList(params); List<SysCategory> categoryList = sysCategoryService.queryPageList(params);
IPage<SysCategory> pageList = new Page<>();
pageList.setRecords(categoryList);
return Result.OK(pageList); return Result.OK(pageList);
} }
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysCategoryMapper.java
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.Map;
*/ */
public interface SysCategoryMapper extends BaseMapper<SysCategory> { public interface SysCategoryMapper extends BaseMapper<SysCategory> {
IPage<SysCategory> queryPageList(IPage page, @Param("params") Map<String,Object> params); List<SysCategory> queryPageList(@Param("params") Map<String,Object> params);
/** /**
* 根据父级ID查询树节点数据 * 根据父级ID查询树节点数据
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysCategoryMapper.xml
-1
View File
@@ -22,7 +22,6 @@
del_flag,description,en_name,has_child,id,is_read_only,is_tag_dict,item_value,name,pid,sys_dict_id del_flag,description,en_name,has_child,id,is_read_only,is_tag_dict,item_value,name,pid,sys_dict_id
from sys_category from sys_category
where is_tag_dict=1 and sys_dict_id=#{params.sysDictId} and del_flag=0 where is_tag_dict=1 and sys_dict_id=#{params.sysDictId} and del_flag=0
<!--搜索条件:标签名称包含%,单独搜索--> <!--搜索条件:标签名称包含%,单独搜索-->
<if test="params.name != null and params.name != ''"> <if test="params.name != null and params.name != ''">
<choose> <choose>
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysCategoryService.java
+1 -1
View File
@@ -61,7 +61,7 @@ public interface ISysCategoryService extends IService<SysCategory> {
void deleteSysCategory(String ids); void deleteSysCategory(String ids);
IPage<SysCategory> queryPageList(Map<String, Object> params); List<SysCategory> queryPageList(Map<String, Object> params);
/** /**
* 获取树形结构 * 获取树形结构
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysCategoryServiceImpl.java
+5 -5
View File
@@ -258,11 +258,11 @@ public class SysCategoryServiceImpl extends ServiceImpl<SysCategoryMapper, SysCa
* @return * @return
*/ */
@Override @Override
public IPage<SysCategory> queryPageList(Map<String, Object> params) { public List<SysCategory> queryPageList(Map<String, Object> params) {
Integer pageNo = Integer.parseInt(params.get("pageNo").toString()); List<SysCategory> result = sysCategoryMapper.queryPageList(params);
Integer pageSize = Integer.parseInt(params.get("pageSize").toString()); // 对所有的数据进行子表查询的数据
IPage page = new Page(pageNo, pageSize);
IPage<SysCategory> result = sysCategoryMapper.queryPageList(page, params);
return result; return result;
} }