From 53b7f0cf030974b6506ee4ed06302fc56dc5ec3c Mon Sep 17 00:00:00 2001
From: hayu <1604366271@qq.com>
Date: Wed, 31 Jul 2024 15:29:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../system/controller/UserController.java | 3 +--
.../resources/mappers/basis/HomeMapper.xml | 25 +++++++++++++------
src/main/resources/static/index.html | 6 ++---
.../static/pages/user/changePassword.html | 14 -----------
4 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/bonus/aqgqj/system/controller/UserController.java b/src/main/java/com/bonus/aqgqj/system/controller/UserController.java
index f53775a..f7eddd2 100644
--- a/src/main/java/com/bonus/aqgqj/system/controller/UserController.java
+++ b/src/main/java/com/bonus/aqgqj/system/controller/UserController.java
@@ -243,9 +243,8 @@ public class UserController {
}
@PostMapping(value = "getPasswordConfig")
-
@LogAnnotation(operModul = "系统管理-用户管理", operation = "获取密码校验规则", operDesc = "系统级事件",operType="查询")
- @PreAuthorize("@pms.hasPermission('sys:user:query')")
+ @PreAuthorize("@pms.hasPermission('sys:user:password')")
public ServerResponse getPasswordConfig() {
try {
PasswordConfig pc = userService.getPasswordConfigById();
diff --git a/src/main/resources/mappers/basis/HomeMapper.xml b/src/main/resources/mappers/basis/HomeMapper.xml
index 5189c59..d635d42 100644
--- a/src/main/resources/mappers/basis/HomeMapper.xml
+++ b/src/main/resources/mappers/basis/HomeMapper.xml
@@ -40,13 +40,14 @@
*
FROM
(
- SELECT aa.id,
- aa.custom_name AS userName,
- aa.custom_user AS contacts,
- aa.custom_phone AS contactPhone,
- SUM(te.dev_num) AS orderNum,
- MAX(te.update_time) AS cooperateDate,
- SUM(te.dev_num * bb.amount) + SUM(IFNULL(ted.amount, 0)) AS totalCost
+ SELECT
+ aa.id,
+ aa.custom_name AS userName,
+ aa.custom_user AS contacts,
+ aa.custom_phone AS contactPhone,
+ SUM( te.dev_num ) AS orderNum,
+ MAX( te.update_time ) AS cooperateDate,
+ SUM( te.dev_num * bb.amount ) + SUM(IFNULL( ted.amount, 0 )) AS totalCost
FROM
(
SELECT
@@ -62,7 +63,14 @@
) aa
LEFT JOIN tb_exper te ON te.submit_unit = aa.id
AND te.del_flag = 0
- LEFT JOIN tb_exper_dev ted ON ted.exper_id = te.id
+ LEFT JOIN(
+ SELECT
+ exper_id,
+ SUM(amount) as amount
+ FROM
+ tb_exper_dev
+ GROUP BY exper_id
+ ) ted ON ted.exper_id = te.id
LEFT JOIN ( SELECT exper_id, SUM( IFNULL( amount, 0 ) ) AS amount FROM tb_exper_items GROUP BY exper_id ) bb ON bb.exper_id = te.id
GROUP BY
te.submit_unit
@@ -71,5 +79,6 @@
cc.cooperateDate IS NOT NULL
ORDER BY
cc.totalCost DESC
+ LIMIT 5
\ No newline at end of file
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index aeb7b3a..ab826d0 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -50,9 +50,9 @@
- -
- 个人信息
-
+
+
+
-
修改密码
diff --git a/src/main/resources/static/pages/user/changePassword.html b/src/main/resources/static/pages/user/changePassword.html
index ea167b0..10c789c 100644
--- a/src/main/resources/static/pages/user/changePassword.html
+++ b/src/main/resources/static/pages/user/changePassword.html
@@ -12,20 +12,6 @@