haozq
/
ah_sz_gqj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题修复

This commit is contained in:
hayu 2024-07-31 15:29:34 +08:00
parent e5f271ee77
commit 53b7f0cf03
4 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/bonus/aqgqj/system/controller/UserController.java
View File

@ -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();

25
src/main/resources/mappers/basis/HomeMapper.xml
View File

@ -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
</select>
</mapper>

6
src/main/resources/static/index.html
View File

@ -50,9 +50,9 @@
<span style="color: #fff !important;"></span>
</a>
<dl class="layui-nav-child">
<dd>
<a href='javascript:;' lay-id="-999" data-url="pages/user/updateMyself.html"><i class="fa fa-user-circle" aria-hidden="true"></i> 个人信息</a>
</dd>
<!-- <dd>-->
<!-- <a href='javascript:;' lay-id="-999" data-url="pages/user/updateMyself.html"><i class="fa fa-user-circle" aria-hidden="true"></i> 个人信息</a>-->
<!-- </dd>-->
<dd>
<a href='javascript:;' lay-id="-998" onclick="changeUserPwd()"><i class="fa fa-drupal" aria-hidden="true"></i> 修改密码</a>
</dd>

14
src/main/resources/static/pages/user/changePassword.html
View File

@ -12,20 +12,6 @@
<form class="form-horizontal layui-form" onsubmit="return false" id="form">
<fieldset>
<input type="hidden" id="id" name="id">
<!-- <div class="layui-form-item" style="margin-top: 2%;">-->
<!-- <label class="layui-form-label"><i style="padding: 0 10px;">*</i>用户名</label>-->
<!-- <div class="layui-input-inline">-->
<!-- <input class="form-control layui-input" placeholder="用户名" type="text" name="username" id="username" maxlength="30"-->
<!-- lay-verify="required">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="layui-form-item" style="margin-top: 2%;">-->
<!-- <label class="layui-form-label"><i style="padding: 0 10px;">*</i>登录名</label>-->
<!-- <div class="layui-input-inline">-->
<!-- <input class="form-control layui-input" placeholder="登录名" type="text" name="loginName" id="loginName" maxlength="30"-->
<!-- lay-verify="required">-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>旧密码</label>
<div class="layui-input-inline password">