From c957a8c67d593966e4882f8bef73c7d58012f19d Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 02 Jan 2023 09:25:37 +0800
Subject: [PATCH] 1、任务接收问题修复
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 2 +-
src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index dfeaa64..6da776c 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -216,7 +216,7 @@
w.dept_name as gzd FROM blade_user u
LEFT JOIN sys_jurisdiction j on j.id = u.jurisdiction
LEFT JOIN sys_jurisdiction w on w.id = u.workjurisdiction
- where 1 = 1 and is_deleted = 0
+ where 1 = 1 and u.is_deleted = 0
<if test="user.jurisdiction!=null and user.jurisdiction != ''">
and (jurisdiction = #{user.jurisdiction} or workjurisdiction = #{user.jurisdiction})
</if>
diff --git a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
index 4f5be78..a25b5c5 100644
--- a/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
+++ b/src/main/java/org/springblade/modules/taskqd/controller/TaskqdController.java
@@ -106,6 +106,14 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入task")
public R update(@Valid @RequestBody Taskqd taskqd) {
+
+ if (taskqd.getStime() == null || taskqd.getStime().equals("")){
+ taskqd.setStime(null);
+ }
+ if (taskqd.getSendtime() == null || taskqd.getSendtime().equals("")){
+ taskqd.setSendtime(null);
+ }
+
return R.status(taskqdService.updateById(taskqd));
}
--
Gitblit v1.9.3