From b58f703127da6f0511f6617519733dd90e9eb710 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 20 二月 2024 13:22:10 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java | 15 ++++++++++++++-
zy-asrs-flow/src/pages/system/dept/index.jsx | 11 ++---------
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java | 4 +++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java | 4 +++-
4 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/dept/index.jsx b/zy-asrs-flow/src/pages/system/dept/index.jsx
index f22950a..bc080e3 100644
--- a/zy-asrs-flow/src/pages/system/dept/index.jsx
+++ b/zy-asrs-flow/src/pages/system/dept/index.jsx
@@ -115,18 +115,11 @@
const columns = [
{
- title: 'No',
- dataIndex: 'index',
- valueType: 'indexBorder',
- width: 48,
- },
- {
title: '閮ㄩ棬鍚嶇О',
dataIndex: 'name',
valueType: 'text',
hidden: false,
- width: 140,
- copyable: true,
+ width: 240,
filterDropdown: (props) => <TextFilter
name='name'
{...props}
@@ -135,7 +128,7 @@
/>,
},
{
- title: '涓婄骇閮ㄩ棬鍚�',
+ title: '涓婄骇閮ㄩ棬',
dataIndex: 'parentName',
valueType: 'text',
hidden: true,
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
index 9b924f1..eb9202c 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
@@ -12,6 +12,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.function.Consumer;
/**
* Created by vincent on 2/13/2024
@@ -65,8 +66,16 @@
return this.buildWrapper(false);
}
- @SuppressWarnings("all")
+ public QueryWrapper<T> buildWrapper(Consumer<QueryWrapper<T>> consumer) {
+ return this.buildWrapper(false, consumer);
+ }
+
public QueryWrapper<T> buildWrapper(boolean like) {
+ return this.buildWrapper(like, null);
+ }
+
+ @SuppressWarnings("all")
+ public QueryWrapper<T> buildWrapper(boolean like, Consumer<QueryWrapper<T>> consumer) {
QueryWrapper<T> queryWrapper = new QueryWrapper<>();
Map<String, Object> map = where.getMap();
for (String key : map.keySet()) {
@@ -98,6 +107,10 @@
}
}
+ if (null != consumer) {
+ consumer.accept(queryWrapper);
+ }
+
Field[] fields = null;
if (!Cools.isEmpty(cls)) {
fields = Cools.getAllFields(cls);
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java
index f138f48..7d32bd4 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/DeptController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wcs.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -45,7 +46,8 @@
@PostMapping("/dept/tree")
public R tree(@RequestBody Map<String, Object> map) {
PageParam<Dept, BaseParam> param = new PageParam<>(buildParam(map, BaseParam.class), Dept.class);
- List<Dept> deptList = deptService.list(param.buildWrapper(true));
+ QueryWrapper<Dept> wrapper = param.buildWrapper(true, queryWrapper -> queryWrapper.orderByAsc("sort"));
+ List<Dept> deptList = deptService.list(wrapper);
return R.ok().add(Utils.toTreeData(deptList, 0L, Dept::getParentId, Dept::getId, Dept::setChildren));
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java
index dc81cad..1335746 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/MenuController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.wcs.system.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.framework.common.Cools;
import com.zy.asrs.framework.common.R;
@@ -45,7 +46,8 @@
@PostMapping("/menu/tree")
public R tree(@RequestBody Map<String, Object> map) {
PageParam<Menu, BaseParam> param = new PageParam<>(buildParam(map, BaseParam.class), Menu.class);
- List<Menu> menus = menuService.list(param.buildWrapper(true));
+ QueryWrapper<Menu> wrapper = param.buildWrapper(true, queryWrapper -> queryWrapper.orderByAsc("sort"));
+ List<Menu> menus = menuService.list(wrapper);
return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
}
--
Gitblit v1.9.1