|
|
@@ -533,7 +533,7 @@ public class SysController {
|
|
|
@RequestMapping(value = "/query_service_unit", method = RequestMethod.POST)
|
|
|
@ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = TBService.class)})
|
|
|
public Result queryServiceUnit(@ApiParam(value = "业务类型") @RequestParam(required = false) ProductTypeEnum type,
|
|
|
- @ApiParam(value = "服务状态") @RequestParam(required = false) ServiceStatusEnum status,
|
|
|
+ @ApiParam(value = "服务状态") @RequestParam(required = false) List<ServiceStatusEnum> statusList,
|
|
|
@ApiParam(value = "服务单元名称") @RequestParam(required = false) String name) {
|
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
|
DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
|
|
|
@@ -542,10 +542,8 @@ public class SysController {
|
|
|
if (Objects.nonNull(type)) {
|
|
|
queryWrapper.lambda().eq(TBService::getType, type);
|
|
|
}
|
|
|
- if (Objects.nonNull(status)) {
|
|
|
- queryWrapper.lambda().eq(TBService::getStatus, status);
|
|
|
- } else {
|
|
|
- queryWrapper.lambda().and(qw -> qw.eq(TBService::getStatus,ServiceStatusEnum.PUBLISH).or().eq(TBService::getStatus,ServiceStatusEnum.FINISH));
|
|
|
+ if (!CollectionUtils.isEmpty(statusList)) {
|
|
|
+ queryWrapper.lambda().in(TBService::getStatus, statusList);
|
|
|
}
|
|
|
if (name != null && name.length() > 0) {
|
|
|
queryWrapper.lambda().like(TBService::getName, SystemConstant.translateSpecificSign(name));
|
caozixuan