问题修复
This commit is contained in:
parent
e5f271ee77
commit
53b7f0cf03
|
|
@ -243,9 +243,8 @@ public class UserController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping(value = "getPasswordConfig")
|
@PostMapping(value = "getPasswordConfig")
|
||||||
|
|
||||||
@LogAnnotation(operModul = "系统管理-用户管理", operation = "获取密码校验规则", operDesc = "系统级事件",operType="查询")
|
@LogAnnotation(operModul = "系统管理-用户管理", operation = "获取密码校验规则", operDesc = "系统级事件",operType="查询")
|
||||||
@PreAuthorize("@pms.hasPermission('sys:user:query')")
|
@PreAuthorize("@pms.hasPermission('sys:user:password')")
|
||||||
public ServerResponse getPasswordConfig() {
|
public ServerResponse getPasswordConfig() {
|
||||||
try {
|
try {
|
||||||
PasswordConfig pc = userService.getPasswordConfigById();
|
PasswordConfig pc = userService.getPasswordConfigById();
|
||||||
|
|
|
||||||
|
|
@ -40,13 +40,14 @@
|
||||||
*
|
*
|
||||||
FROM
|
FROM
|
||||||
(
|
(
|
||||||
SELECT aa.id,
|
SELECT
|
||||||
|
aa.id,
|
||||||
aa.custom_name AS userName,
|
aa.custom_name AS userName,
|
||||||
aa.custom_user AS contacts,
|
aa.custom_user AS contacts,
|
||||||
aa.custom_phone AS contactPhone,
|
aa.custom_phone AS contactPhone,
|
||||||
SUM(te.dev_num) AS orderNum,
|
SUM( te.dev_num ) AS orderNum,
|
||||||
MAX(te.update_time) AS cooperateDate,
|
MAX( te.update_time ) AS cooperateDate,
|
||||||
SUM(te.dev_num * bb.amount) + SUM(IFNULL(ted.amount, 0)) AS totalCost
|
SUM( te.dev_num * bb.amount ) + SUM(IFNULL( ted.amount, 0 )) AS totalCost
|
||||||
FROM
|
FROM
|
||||||
(
|
(
|
||||||
SELECT
|
SELECT
|
||||||
|
|
@ -62,7 +63,14 @@
|
||||||
) aa
|
) aa
|
||||||
LEFT JOIN tb_exper te ON te.submit_unit = aa.id
|
LEFT JOIN tb_exper te ON te.submit_unit = aa.id
|
||||||
AND te.del_flag = 0
|
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
|
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
|
GROUP BY
|
||||||
te.submit_unit
|
te.submit_unit
|
||||||
|
|
@ -71,5 +79,6 @@
|
||||||
cc.cooperateDate IS NOT NULL
|
cc.cooperateDate IS NOT NULL
|
||||||
ORDER BY
|
ORDER BY
|
||||||
cc.totalCost DESC
|
cc.totalCost DESC
|
||||||
|
LIMIT 5
|
||||||
</select>
|
</select>
|
||||||
</mapper>
|
</mapper>
|
||||||
|
|
@ -50,9 +50,9 @@
|
||||||
<span style="color: #fff !important;"></span>
|
<span style="color: #fff !important;"></span>
|
||||||
</a>
|
</a>
|
||||||
<dl class="layui-nav-child">
|
<dl class="layui-nav-child">
|
||||||
<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>
|
<!-- <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>-->
|
||||||
<dd>
|
<dd>
|
||||||
<a href='javascript:;' lay-id="-998" onclick="changeUserPwd()"><i class="fa fa-drupal" aria-hidden="true"></i> 修改密码</a>
|
<a href='javascript:;' lay-id="-998" onclick="changeUserPwd()"><i class="fa fa-drupal" aria-hidden="true"></i> 修改密码</a>
|
||||||
</dd>
|
</dd>
|
||||||
|
|
|
||||||
|
|
@ -12,20 +12,6 @@
|
||||||
<form class="form-horizontal layui-form" onsubmit="return false" id="form">
|
<form class="form-horizontal layui-form" onsubmit="return false" id="form">
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<input type="hidden" id="id" name="id">
|
<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%;">
|
<div class="layui-form-item" style="margin-top: 2%;">
|
||||||
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>旧密码</label>
|
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>旧密码</label>
|
||||||
<div class="layui-input-inline password">
|
<div class="layui-input-inline password">
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue