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

微调

Browse Source
This commit is contained in:
hongawen
2024-06-20 13:32:16 +08:00
parent 197d3df0fb
commit c994ada5e7
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
View File

@@ -599,14 +599,26 @@ public class UserController extends BaseController {
/** /**
* 查询所有用户 * 查询所有用户不包含管理员
*/ */
@OperateInfo(info = LogEnum.SYSTEM_COMMON) @OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/simpleList") @GetMapping("/simpleList")
@ApiOperation("查询所有用户作为下拉框") @ApiOperation("查询所有用户作为下拉框")
public HttpResult<Object> simpleList() { public HttpResult<Object> simpleList() {
String methodDescribe = getMethodDescribe("simpleList"); String methodDescribe = getMethodDescribe("simpleList");
List<User> result = userService.simpleList(); List<User> result = userService.simpleList(false);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
/**
* 查询所有用户包含管理员
*/
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@GetMapping("/getAllUserSimpleList")
@ApiOperation("查询所有用户作为下拉框")
public HttpResult<Object> getAllUserSimpleList() {
String methodDescribe = getMethodDescribe("getAllUserSimpleList");
List<User> result = userService.simpleList(true);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
} }
} }

2
pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java
View File

@@ -197,7 +197,7 @@ public interface IUserService extends IService<User> {
List<String> getUserIdByRoleId(List<String> roleId); List<String> getUserIdByRoleId(List<String> roleId);
List<User> simpleList(); List<User> simpleList(Boolean allUserFlag);
List<String> getColleaguesIdByUserId(String id); List<String> getColleaguesIdByUserId(String id);

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

@@ -567,9 +567,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
} }
@Override @Override
public List<User> simpleList() { public List<User> simpleList(Boolean allUserFlag) {
LambdaQueryWrapper<User> userLambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<User> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
userLambdaQueryWrapper.select(User::getId, User::getName).eq(User::getState, DataStateEnum.ENABLE.getCode()).eq(User::getType,2); userLambdaQueryWrapper.select(User::getId, User::getName).eq(User::getState, DataStateEnum.ENABLE.getCode());
if(!allUserFlag){
userLambdaQueryWrapper.eq(User::getType,2);
}
return this.baseMapper.selectList(userLambdaQueryWrapper); return this.baseMapper.selectList(userLambdaQueryWrapper);
} }