浏览代码

优化用户管理,加上重置密码的权限

jishenghua 9 月之前
父节点
当前提交
429a8f2174

+ 2 - 0
gyj-iot-boot/gyjiot-admin/src/main/java/com/gyjiot/web/controller/system/SysProfileController.java

@@ -20,6 +20,7 @@ import com.gyjiot.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -105,6 +106,7 @@ public class SysProfileController extends BaseController
      * 重置密码
      */
     @ApiOperation("重置密码")
+    @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
     public AjaxResult updatePwd(@RequestBody Map<String, String> params)

+ 1 - 1
gyj-iot-boot/gyjiot-service/gyjiot-system-service/src/main/resources/mapper/system/SysUserMapper.xml

@@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectUserList" parameterType="com.gyjiot.common.core.domain.entity.SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
-		where u.del_flag = '0'
+		where u.del_flag = '0' and u.user_id!=1
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 		</if>