|
@@ -66,28 +66,28 @@ public class TBDelayWarnServiceImpl extends ServiceImpl<TBDelayWarnMapper, TBDel
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
|
|
DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
|
|
DataPermissionDto dpr = sysUserService.buildUserDataPermission(requestUser.getId());
|
|
List<String> fieldObjList = new ArrayList<>();
|
|
List<String> fieldObjList = new ArrayList<>();
|
|
- if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.PROJECT_KEY_INFO_DATE.getTitle().contains(fieldObj)) {
|
|
|
|
|
|
+ if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.PROJECT_KEY_INFO_DATE.getTitle().contains(fieldObj.trim())) {
|
|
fieldObjList.add(ProcessLimitedEnum.PROJECT_KEY_INFO_DATE.getKey());
|
|
fieldObjList.add(ProcessLimitedEnum.PROJECT_KEY_INFO_DATE.getKey());
|
|
}
|
|
}
|
|
- if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.APPROVE_RADIO.getTitle().contains(fieldObj)) {
|
|
|
|
|
|
+ if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.APPROVE_RADIO.getTitle().contains(fieldObj.trim())) {
|
|
fieldObjList.add(ProcessLimitedEnum.APPROVE_RADIO.getKey());
|
|
fieldObjList.add(ProcessLimitedEnum.APPROVE_RADIO.getKey());
|
|
}
|
|
}
|
|
- if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.SCAN_START_TIME.getTitle().contains(fieldObj)) {
|
|
|
|
|
|
+ if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.SCAN_START_TIME.getTitle().contains(fieldObj.trim())) {
|
|
fieldObjList.add(ProcessLimitedEnum.SCAN_START_TIME.getKey());
|
|
fieldObjList.add(ProcessLimitedEnum.SCAN_START_TIME.getKey());
|
|
}
|
|
}
|
|
- if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.SCAN_END_TIME.getTitle().contains(fieldObj)) {
|
|
|
|
|
|
+ if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.SCAN_END_TIME.getTitle().contains(fieldObj.trim())) {
|
|
fieldObjList.add(ProcessLimitedEnum.SCAN_END_TIME.getKey());
|
|
fieldObjList.add(ProcessLimitedEnum.SCAN_END_TIME.getKey());
|
|
}
|
|
}
|
|
- if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.MARK_START_TIME.getTitle().contains(fieldObj)) {
|
|
|
|
|
|
+ if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.MARK_START_TIME.getTitle().contains(fieldObj.trim())) {
|
|
fieldObjList.add(ProcessLimitedEnum.MARK_START_TIME.getKey());
|
|
fieldObjList.add(ProcessLimitedEnum.MARK_START_TIME.getKey());
|
|
}
|
|
}
|
|
- if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.MARK_END_TIME.getTitle().contains(fieldObj)) {
|
|
|
|
|
|
+ if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.MARK_END_TIME.getTitle().contains(fieldObj.trim())) {
|
|
fieldObjList.add(ProcessLimitedEnum.MARK_END_TIME.getKey());
|
|
fieldObjList.add(ProcessLimitedEnum.MARK_END_TIME.getKey());
|
|
}
|
|
}
|
|
- if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.SERVICE_FINISH_PLAN_DATE.getTitle().contains(fieldObj)) {
|
|
|
|
|
|
+ if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.SERVICE_FINISH_PLAN_DATE.getTitle().contains(fieldObj.trim())) {
|
|
fieldObjList.add(ProcessLimitedEnum.SERVICE_FINISH_PLAN_DATE.getKey());
|
|
fieldObjList.add(ProcessLimitedEnum.SERVICE_FINISH_PLAN_DATE.getKey());
|
|
}
|
|
}
|
|
- if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getTitle().contains(fieldObj)) {
|
|
|
|
|
|
+ if (Objects.nonNull(fieldObj) && ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getTitle().contains(fieldObj.trim())) {
|
|
fieldObjList.add(ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getKey());
|
|
fieldObjList.add(ProcessLimitedEnum.ENV_DEPLOYMENT_TIME.getKey());
|
|
}
|
|
}
|
|
if (Objects.nonNull(fieldObj) && CollectionUtils.isEmpty(fieldObjList)) {
|
|
if (Objects.nonNull(fieldObj) && CollectionUtils.isEmpty(fieldObjList)) {
|