修改

zxkf-api/src/main/java/api/controller/system/UserController.java

     @Autowired
     private IUserService userService;
     @Autowired
-    private UserMapper userMapper;
-    @Autowired
     private IDeptService deptService;
     @Autowired
     private IRoleService roleService;
     @Log(title = "查询用户详情", businessType = BusinessType.QUERY)
     @GetMapping("/{id}")
     public AjaxResult getInfo(@PathVariable Long id) {
-        User user = userMapper.selectUserById(id);
+        User user = userService.selectUserById(id);
         if (user == null) {
             return Error("用户不存在");
         }
     @Log(title = "新增用户", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody User user) {
-        Integer integer = 0;
-        if (!userService.checkUserNameUnique(user, integer)) {
+        if (!userService.checkUserNameUnique(user)) {
             return Error("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringHelper.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user, integer)) {
+        } else if (StringHelper.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
             return Error("新增用户'" + user.getUserName() + "'失败，手机号码已存在或者手机号格式错误");
-        } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user, integer)) {
+        } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
             return Error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setPassword(SecretHelper.MD5(user.getPassword()));
     @Log(title = "修改角色信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody User user) {
-        Integer integer = 1;
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user);
-        if (!userService.checkUserNameUnique(user, integer)) {
+        if (!userService.checkUserNameUnique(user)) {
             return Error("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringHelper.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user, integer)) {
+        } else if (StringHelper.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
             return Error("修改用户'" + user.getUserName() + "'失败，手机号码已存在或者手机号格式错误");
-        } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user, integer)) {
+        } else if (StringHelper.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
             return Error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setCreateBy(CurrentUser().getUserName());

zxkf-service/src/main/java/api/service/system/IUserService.java

      * @param user 用户信息
      * @return 结果
      */
-    public boolean checkUserNameUnique(User user,Integer integer);
+    public boolean checkUserNameUnique(User user);
     /**
      * 校验用户昵称是否唯一
      *
      * @param user 用户信息
      * @return 结果
      */
-    public boolean checkNickNameUnique(User user,Integer integer);
+    public boolean checkNickNameUnique(User user);
 
     /**
      * 校验手机号码是否唯一
      * @param user 用户信息
      * @return 结果
      */
-    public boolean checkPhoneUnique(User user,Integer integer);
+    public boolean checkPhoneUnique(User user);
 
     /**
      * 校验email是否唯一
      * @param user 用户信息
      * @return 结果
      */
-    public boolean checkEmailUnique(User user,Integer integer);
+    public boolean checkEmailUnique(User user);
 
     /**
      * 导入用户数据
     public void checkUserDataScope(User user);
 
     /**
+     * 通过用户ID查询用户
+     *
+     * @param userId 用户ID
+     * @return 用户对象信息
+     */
+    public User selectUserById(Long userId);
+
+    /**
      * 根据roleid获取用户列表
      */
     public List<User> selectUserListByRoleId(Long roleId);

zxkf-service/src/main/java/api/service/system/impl/UserServiceImpl.java

      * @return 结果
      */
     @Override
-    public boolean checkUserNameUnique(User user, Integer integer) {
+    public boolean checkUserNameUnique(User user) {
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
         qw.eq(User::getUserName, user.getUserName()).eq(User::getDelFlag, "0");
         User entity = this.getEntity(qw);
 
         if (!StringHelper.isNull(entity)) {
-            if (integer == 2 && user.getUserId().equals(entity.getUserId())) {
+            if (user.getUserId() > 0 && user.getUserId().equals(entity.getUserId())) {
                 return true;
             }
             return false;
      * @return 结果
      */
     @Override
-    public boolean checkNickNameUnique(User user, Integer integer) {
+    public boolean checkNickNameUnique(User user) {
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
         qw.eq(User::getNickName, user.getNickName()).eq(User::getDelFlag, "0");
         User entity = this.getEntity(qw);
 
         if (!StringHelper.isNull(entity)) {
-            if (integer == 2 && user.getUserId().equals(entity.getUserId())) {
+            if (user.getUserId() > 0 && user.getUserId().equals(entity.getUserId())) {
                 return true;
             }
             return false;
      * @return
      */
     @Override
-    public boolean checkPhoneUnique(User user, Integer integer) {
+    public boolean checkPhoneUnique(User user) {
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
         qw.eq(User::getPhonenumber, user.getPhonenumber()).eq(User::getDelFlag, "0");
         User entity = this.getEntity(qw);
             return false;
         }
         if (!StringHelper.isNull(entity)) {
-            if (integer == 2 && user.getUserId().equals(entity.getUserId())) {
+            if (user.getUserId() > 0 && user.getUserId().equals(entity.getUserId())) {
                 return true;
             }
             return false;
      * @return
      */
     @Override
-    public boolean checkEmailUnique(User user, Integer integer) {
+    public boolean checkEmailUnique(User user) {
         LambdaQueryWrapper<User> qw = new LambdaQueryWrapper<>();
         qw.eq(User::getEmail, user.getEmail()).eq(User::getDelFlag, "0");
         User entity = this.getEntity(qw);
 
         if (!StringHelper.isNull(entity)) {
-            if (integer == 2 && user.getUserId().equals(entity.getUserId())) {
+            if (user.getUserId() > 0 && user.getUserId().equals(entity.getUserId())) {
                 return true;
             }
             return false;
      */
     @Override
     public void checkUserDataScope(User user) {
-        if (user == null) {
-            throw new RuntimeException("没有权限访问用户数据！");
+        if(!user.isAdmin()) {
+            if (user == null) {
+                throw new RuntimeException("没有权限访问用户数据！");
+            }
         }
     }
 
     /**
+     * 通过用户ID查询用户
+     *
+     * @param userId 用户ID
+     * @return 用户对象信息
+     */
+    public User selectUserById(Long userId){
+        return userMapper.selectUserById(userId);
+    }
+
+    /**
      * 导入用户数据
      *
      * @param userList        用户数据列表