From 5745a87f3a139ea2bbdaf4704978e4c151ecc45a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 23 Jan 2024 17:39:48 +0800
Subject: [PATCH] 物业管理管和项目经理数据过滤
---
src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
index 862a924..bb79c73 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskCampusReportingEventServiceImpl.java
@@ -83,11 +83,15 @@
@Override
public Boolean updateCampusReporting(TaskCampusReportingEventDTO taskCampusReportingEvent) throws Exception {
- Integer integer = StringUtils.isBlank(taskCampusReportingEvent.getConfirmFlag()) ? null : Integer.valueOf(taskCampusReportingEvent.getConfirmFlag());
+ Integer integer = null==taskCampusReportingEvent.getStatus() ? null : taskCampusReportingEvent.getStatus();
Long aLong = taskService.updateTask(null, null, null, "", AuthUtil.getUserId(), taskCampusReportingEvent.getTaskId(), integer);
if (aLong > 0) {
- taskCampusReportingEvent.setConfirmUserId(AuthUtil.getUserId());
- taskCampusReportingEvent.setConfirmTime(new Date());
+ if (null!=taskCampusReportingEvent.getStatus()
+ && taskCampusReportingEvent.getStatus()!=4) {
+ taskCampusReportingEvent.setConfirmFlag(taskCampusReportingEvent.getStatus().toString());
+ taskCampusReportingEvent.setConfirmUserId(AuthUtil.getUserId());
+ taskCampusReportingEvent.setConfirmTime(new Date());
+ }
Boolean b = baseMapper.updateById(taskCampusReportingEvent) > 0;
if (b) {
return b;
--
Gitblit v1.9.3