lbqms.git - Gitblit

			@@ -8,7 +8,9 @@
			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
			import com.ruoyi.common.core.page.TableDataInfo;
			import com.ruoyi.common.core.service.UserService;
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.utils.LoginUtils;
			import com.ruoyi.common.utils.PageUtils;
			import com.ruoyi.common.utils.SecurityUtils;
			import com.ruoyi.common.utils.StringUtils;
			@@ -35,7 +37,7 @@
			*/
			@Slf4j
			@Service
			public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser, SysUser> implements ISysUserService {
			public class SysUserServiceImpl extends ServicePlusImpl<SysUserMapper, SysUser, SysUser> implements ISysUserService, UserService {

			@Autowired
			private SysRoleMapper roleMapper;
			@@ -179,7 +181,6 @@
			public String checkPhoneUnique(SysUser user) {
			Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
			long count = count(new LambdaQueryWrapper<SysUser>()
			.select(SysUser::getUserId, SysUser::getPhonenumber)
			.eq(SysUser::getPhonenumber, user.getPhonenumber())
			.ne(SysUser::getUserId, userId));
			if (count > 0) {
			@@ -198,7 +199,6 @@
			public String checkEmailUnique(SysUser user) {
			Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
			long count = count(new LambdaQueryWrapper<SysUser>()
			.select(SysUser::getUserId, SysUser::getEmail)
			.eq(SysUser::getEmail, user.getEmail())
			.ne(SysUser::getUserId, userId));
			if (count > 0) {
			@@ -226,7 +226,7 @@
			*/
			@Override
			public void checkUserDataScope(Long userId) {
			if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
			if (!SysUser.isAdmin(LoginUtils.getUserId())) {
			SysUser user = new SysUser();
			user.setUserId(userId);
			List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);