java/Robotaxi.git

			@@ -9,6 +9,7 @@
			import com.xiaopeng.account.model.query.SysUserListQuery;
			import com.xiaopeng.account.service.*;
			import com.xiaopeng.api.model.account.*;
			import com.xiaopeng.api.vo.account.LoginUser;
			import com.xiaopeng.common.core.domain.R;
			import com.xiaopeng.common.core.enums.DisabledEnum;
			import com.xiaopeng.common.core.exception.ServiceException;
			@@ -82,11 +83,14 @@
			@GetMapping("/api/v1/sys-user/pageList")
			@ApiOperation(value = "账号管理分页列表", tags = {"管理后台-账号管理"})
			public AjaxResult<PageInfo<SysUser>> list(final SysUserListQuery sysUserListQuery) {
			LoginUser loginUser = tokenService.getLoginUser();
			PageInfo<SysUser> pageInfo = new PageInfo<SysUser>(sysUserListQuery.getPageNum(), sysUserListQuery.getPageSize());
			PageInfo<SysUser> page = userService.getList(pageInfo, sysUserListQuery);
			page.getRecords().forEach(user -> {
			user.setPhoneNumber(sysGroupService.getPhoneDesensitization(user.getPhoneNumber()));
			if(!loginUser.getPhoneDesensitizationExempt()){
			user.setPhoneNumber(DesensitizedUtil.mobilePhone(user.getPhoneNumber()));
			// user.setUserAccount(sysGroupService.getPhoneDesensitization(user.getUserAccount()));
			}
			});
			return AjaxResult.success(page);
			}
			@@ -96,8 +100,13 @@
			@GetMapping("/api/v1/sys-user/listAll")
			@ApiOperation(value = "账号管理不分页列表", tags = {"管理后台-账号管理"})
			public R<List<SysUser>> listAll() {
			LoginUser loginUser = tokenService.getLoginUser();
			List<SysUser> listAll = userService.list();
			listAll.forEach(user -> user.setPhoneNumber(sysGroupService.getPhoneDesensitization(user.getPhoneNumber())));
			for (SysUser sysUser : listAll) {
			if(!loginUser.getPhoneDesensitizationExempt()){
			sysUser.setPhoneNumber(DesensitizedUtil.mobilePhone(sysUser.getPhoneNumber()));
			}
			}
			return R.ok(listAll);
			}

			@@ -180,6 +189,7 @@
			@ApiOperation(value = "获取用户详情", tags = {"管理后台-系统用户管理"})
			@GetMapping("/api/v1/getInfo/{userId}")
			public AjaxResult getInfo(@PathVariable Long userId) {
			LoginUser loginUser = tokenService.getLoginUser();
			userService.checkUserDataScope(userId);
			AjaxResult ajax = AjaxResult.success();
			List<SysRole> roles = sysRoleService.list();
			@@ -187,7 +197,9 @@
			ajax.put("posts", postService.selectPostAll());
			if (StringUtils.isNotNull(userId)) {
			SysUser sysUser = userService.selectUserById(userId);
			sysUser.setPhoneNumber(sysGroupService.getPhoneDesensitization(sysUser.getPhoneNumber()));
			if(!loginUser.getPhoneDesensitizationExempt()){
			sysUser.setPhoneNumber(DesensitizedUtil.mobilePhone(sysUser.getPhoneNumber()));
			}
			ajax.put(AjaxResult.DATA_TAG, sysUser);
			ajax.put("postIds", postService.selectPostListByUserId(userId));
			// ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getId).collect(Collectors.toList()));