伊宁项目更改相关 增加特定用户重置账密功能

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -67,8 +67,11 @@ public class SysUserController extends BaseController
 
     @RequiresPermissions("system:user:view")
     @GetMapping()
-    public String user()
+    public String user(ModelMap modelMap)
     {
+        // 当前登录用户
+        SysUser user = ShiroUtils.getSysUser();
+        modelMap.put("currentUser",user);
         return prefix + "/user";
     }
 
@@ -223,6 +226,7 @@ public class SysUserController extends BaseController
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
         user.setSalt(ShiroUtils.randomSalt());
+        user.setStatus("0");
         user.setPassword(passwordService.encryptPassword(user.getLoginName(), user.getPassword(), user.getSalt()));
         if (userService.resetUserPwd(user) > 0)
         {

ruoyi-admin/src/main/resources/templates/system/user/resetPwd.html

@@ -17,6 +17,9 @@
 				<label class="col-sm-3 control-label">输入密码：</label>
 				<div class="col-sm-8">
 					<input class="form-control" type="password" name="password" id="password" th:value="${@config.getKey('sys.user.initPassword')}">
+					<span class="input-group-addon" title="登录密码,鼠标按下显示密码"
+						  onmousedown="$('#password').attr('type','text')"
+						  onmouseup="$('#password').attr('type','password')"><i class="fa fa-key"></i></span>
 				</div>
 			</div>
 		</form>

ruoyi-admin/src/main/resources/templates/system/user/user.html

@@ -90,6 +90,8 @@
 	var editFlag = [[${@permission.hasPermi('system:user:edit')}]];
 	var removeFlag = [[${@permission.hasPermi('system:user:remove')}]];
 	var resetPwdFlag = [[${@permission.hasPermi('system:user:resetPwd')}]];
+	var currentUser = [[${currentUser}]];
+
 	var prefix = ctx + "system/user";
 
 	$(function() {
@@ -162,6 +164,9 @@
 						actions.push("<a class='btn btn-info btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authRole(" + row.userId + ")'><i class='fa fa-check-square-o'></i>分配角色</a> ");
 						actions.push("<a class='btn btn-warning btn-xs " + editFlag + "' href='javascript:void(0)' onclick='authChild("+row.userId+")'><i class='fa fa-edit'></i>添加子账号</a> ");
 						actions.push("<a class='btn btn-default btn-xs " + editFlag + "' href='javascript:void(0)' onclick='findChild("+row.userId+")'><i class='fa fa-eye'></i>查看子账号</a>");
+						if(currentUser!==null&&currentUser.loginName=="adminCzy"){
+                            actions.push("<a class='btn btn-link btn-xs " + editFlag + "' href='javascript:void(0)' onclick='resetPwd("+row.userId+")'><i class='fa fa-plane'></i>重置密码</a>");
+						}
 						return actions.join('');
 					}
 				}]