From 227b19e3eacde392116abd0be4b6141f8e50b306 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 23 二月 2024 09:38:30 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java | 2 +-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java | 7 +++++--
zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml | 2 +-
zy-asrs-flow/src/pages/system/user/index.jsx | 6 +++---
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-flow/src/pages/system/user/index.jsx b/zy-asrs-flow/src/pages/system/user/index.jsx
index 6052f28..8f8df24 100644
--- a/zy-asrs-flow/src/pages/system/user/index.jsx
+++ b/zy-asrs-flow/src/pages/system/user/index.jsx
@@ -141,7 +141,7 @@
}
useEffect(() => {
- const handleResize = () => setBoxHeight(window.innerHeight - 368);
+ const handleResize = () => setBoxHeight(window.innerHeight - 420);
window.addEventListener('resize', handleResize);
handleResize();
@@ -490,7 +490,7 @@
>
<Row gutter={[16, 24]}>
<Col lg={6} md={24}>
- <Card title="閮ㄩ棬" style={{ width: '100%', height: 'calc(100vh - 200px)' }}>
+ <Card title="閮ㄩ棬" style={{ width: '100%', height: 'calc(100vh - 252px)' }}>
<Input
style={{ marginBottom: 10 }}
placeholder="璇疯緭鍏�"
@@ -501,7 +501,7 @@
})
}}
/>
- <div style={{ height: 'calc(100vh - 350px)', overflowY: 'auto' }}>
+ <div style={{ height: 'calc(100vh - 402px)', overflowY: 'auto' }}>
{deptTreeLoading ? (
<Skeleton active />
) : (
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
index 0b652ac..44b02fb 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/RoleController.java
@@ -43,7 +43,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Role, BaseParam> pageParam = new PageParam<>(baseParam, Role.class);
- return R.ok().add(roleService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(roleService.page(pageParam, pageParam.buildWrapper(true, (wrapper) -> wrapper.orderByAsc("create_time"))));
}
@PreAuthorize("hasAuthority('system:role:list')")
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
index 220a56a..da19514 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/system/controller/UserController.java
@@ -20,7 +20,10 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
@RestController
@RequestMapping("/api")
@@ -38,7 +41,7 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<User, BaseParam> pageParam = new PageParam<>(baseParam, User.class);
- return R.ok().add(userService.page(pageParam, pageParam.buildWrapper(true)));
+ return R.ok().add(userService.page(pageParam, pageParam.buildWrapper(true, wrapper -> wrapper.orderByAsc("create_time"))));
}
@PreAuthorize("hasAuthority('system:user:list')")
diff --git a/zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml
index 3904f09..6d8fef4 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/system/UserMapper.xml
@@ -45,7 +45,7 @@
or su.phone like concat('%',#{param.condition},'%')
)
</if>
- order by su.create_time desc
+ order by su.create_time
</select>
</mapper>
--
Gitblit v1.9.1