diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java index 88fbe5fc..b1d64795 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java @@ -125,6 +125,12 @@ public class UserServiceImpl implements IUserService { return userMapper.selectUserList(user); } + @Override + @DataScope(deptAlias = "d", userAlias = "u") + public List selectUserListByHave(User user) { + return userMapper.selectUserListByHave(user); + } + /** * 无权限查询用户列表 * @param user 用户信息 @@ -171,6 +177,15 @@ public class UserServiceImpl implements IUserService { return userMapper.selectUserByLoginName(userName); } + @Override + public User selectClientUserByLoginName(String userName, Integer userSource) { + UserSearchDto userSearchDto = new UserSearchDto(); + userSearchDto.setUserSource(userSource); + userSearchDto.setLoginName(userName); + User user = userMapper.selectClientUserByLoginName(userSearchDto); + return user; + } + /** * 通过手机号码查询用户 * @@ -182,6 +197,15 @@ public class UserServiceImpl implements IUserService { return userMapper.selectUserByPhoneNumber(phoneNumber); } + @Override + public User selectClientUserByPhoneNumber(String phoneNumber, Integer userSource) { + UserSearchDto userSearchDto = new UserSearchDto(); + userSearchDto.setUserSource(userSource); + userSearchDto.setPhone(phoneNumber); + User user = userMapper.selectClientUserByUserPhone(userSearchDto); + return user; + } + /** * 通过邮箱查询用户 * @@ -684,6 +708,8 @@ public class UserServiceImpl implements IUserService { user.setCreateAt(jsonObject.getString("createAt")); user.setUpdateAt(jsonObject.getString("updateAt")); user.setGuid(jsonObject.getString("guid")); + //用户类型 0 系统用户 + user.setUserSource(0); //手机号加密 String mobileNumber = ""; try {