Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
caozehui
2026-04-23 08:53:24 +08:00
parent 850b3174a2 87818db6f3
commit 0902f92838
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-common/common-echarts/src/main/java/com/njcn/echarts/util/DrawPicUtil.java
View File

@@ -57,8 +57,8 @@ public class DrawPicUtil {
/*** /***
* 绘制波形图
* @author hongawen * @author hongawen
* 绘制波形图
* @date 2023/6/21 11:01 * @date 2023/6/21 11:01
* @return String base64数据 * @return String base64数据
*/ */

26
pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
View File

@@ -490,26 +490,28 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
@Override @Override
public List<UserVO> getFormalUserList() { public List<UserVO> getFormalUserList() {
List<UserVO> users = new ArrayList<>(); List<UserVO> users = new ArrayList<>();
Role roleByCode1 = roleService.getRoleByCode(AppRoleEnum.APP_VIP_USER.getCode()); Role roleByCode1 = roleService.getRoleByCode(AppRoleEnum.ENGINEERING_USER.getCode());
Role roleByCode2 = roleService.getRoleByCode(AppRoleEnum.BXS_USER.getCode()); Role roleByCode2 = roleService.getRoleByCode(AppRoleEnum.MARKET_USER.getCode());
Role roleByCode3 = roleService.getRoleByCode(AppRoleEnum.REGULAR_USER_8000.getCode());
Role roleByCode4 = roleService.getRoleByCode(AppRoleEnum.REGULAR_USER.getCode());
List<UserRole> userRoles = userRoleMapper.selectUserRole( List<UserRole> userRoles = userRoleMapper.selectUserRole(
Stream.of(roleByCode1.getId() Stream.of(roleByCode1.getId()
,roleByCode2.getId() ,roleByCode2.getId()
,roleByCode3.getId()
,roleByCode4.getId()
).collect(Collectors.toList())); ).collect(Collectors.toList()));
List<String> collect = userRoles.stream().map(UserRole::getUserId).distinct().collect(Collectors.toList()); List<String> collect = userRoles.stream().map(UserRole::getUserId).distinct().collect(Collectors.toList());
List<User> users1 = this.listByIds(collect);
LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(User::getState, Arrays.asList(1,2,4,5))
.in(User::getType,Arrays.asList(2,3));
List<User> users1 = this.list(queryWrapper);
if (CollectionUtil.isNotEmpty(users1)) { if (CollectionUtil.isNotEmpty(users1)) {
users1.forEach(item->{ users1.forEach(item->{
if (item.getState() == 1) { //剔除工程 营销用户
UserVO userVO = new UserVO(); if (collect.contains(item.getId())) {
userVO.setId(item.getId()); return;
userVO.setName(item.getName());
users.add(userVO);
} }
UserVO userVO = new UserVO();
userVO.setId(item.getId());
userVO.setName(item.getName());
users.add(userVO);
}); });
} }
return users; return users;