From 47e7959d72e63cde35a18aac8832d4e6d9ce802a Mon Sep 17 00:00:00 2001
From: maxiangong <298222784@qq.com>
Date: Fri, 24 Apr 2026 10:57:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A9=E6=95=88=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BsEfficiencyTaskController.java           | 18 +++++++++++++++++
 .../mapper/EfficiencyTaskMapper.xml           | 20 +++++++++++++++----
 .../impl/BsEfficiencyTaskServiceImpl.java     |  7 ++++---
 .../impl/BsEfficiencyTempServiceImpl.java     | 14 ++++++-------
 4 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java
index 8c519261..f408d597 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/controller/BsEfficiencyTaskController.java
@@ -96,6 +96,9 @@ public class BsEfficiencyTaskController extends BladeController {
         if (task == null) {
             R.fail("绩效任务查询失败");
         }
+        if(task.getIsDeleted() != 0){
+            R.fail("当前绩效任务已删除");
+        }
         if (!"1".equals(task.getType())) {
             R.fail("绩效任务类型检查失败");
         }
@@ -121,6 +124,9 @@ public class BsEfficiencyTaskController extends BladeController {
         if (task == null) {
             R.fail("绩效任务查询失败");
         }
+        if(task.getIsDeleted() != 0){
+            R.fail("当前绩效任务已删除");
+        }
         if (!"1".equals(task.getType())) {
             R.fail("绩效任务类型检查失败");
         }
@@ -150,6 +156,9 @@ public class BsEfficiencyTaskController extends BladeController {
         if (bsEfficiencyTask.getAttachId() == null) {
             R.fail("请先上传附件");
         }
+        if(subTask.getIsDeleted() != 0){
+            R.fail("当前绩效任务明细已删除");
+        }
         if (!"2".equals(subTask.getType())) {
             R.fail("绩效任务类型检查失败");
         }
@@ -177,6 +186,9 @@ public class BsEfficiencyTaskController extends BladeController {
         if (subTask == null) {
             R.fail("绩效任务明细查询失败");
         }
+        if(subTask.getIsDeleted() != 0){
+            R.fail("当前绩效任务明细已删除");
+        }
         if (!"2".equals(subTask.getType())) {
             R.fail("绩效任务类型检查失败");
         }
@@ -298,6 +310,9 @@ public class BsEfficiencyTaskController extends BladeController {
         if (bsEfficiencyTask.getAttachId() == null) {
             R.fail("请先上传附件");
         }
+        if(task.getIsDeleted() != 0){
+            R.fail("当前绩效任务已删除");
+        }
         if (!"1".equals(task.getType())) {
             R.fail("绩效任务类型检查失败");
         }
@@ -387,6 +402,9 @@ public class BsEfficiencyTaskController extends BladeController {
             return R.fail("绩效填报详情查询失败");
         }
         BsEfficiencyTaskVO task = list.get(0);
+        if(task.getIsDeleted() != 0){
+            R.fail("当前绩效任务已删除");
+        }
         BsEfficiencyTaskDTO sub = new BsEfficiencyTaskDTO();
         sub.setParentId(task.getId());
         sub.setType("2");
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml
index ec33d5a9..e177704f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/mapper/EfficiencyTaskMapper.xml
@@ -39,10 +39,22 @@
                 and t.type = #{bsEfficiencyTask.type}
             </if>
             <if test="bsEfficiencyTask.taskName!=null">
-                and t.task_name like concat(concat('%', #{bsEfficiencyTask.taskName}),'%')
+                and (t.task_name like concat(concat('%', #{bsEfficiencyTask.taskName}),'%')
+                OR EXISTS (
+                SELECT 1 FROM BS_EFFICIENCY_TASK ts
+                WHERE ts.parent_id = t.id
+                AND ts.is_deleted = 0
+                AND ts.task_name LIKE concat(concat('%', #{bsEfficiencyTask.taskName}),'%')
+                ))
             </if>
             <if test="bsEfficiencyTask.reportUserName!=null">
-                and bu.name like concat(concat('%', #{bsEfficiencyTask.reportUserName}),'%')
+                and (bu.real_name like concat(concat('%', #{bsEfficiencyTask.reportUserName}),'%')
+                OR EXISTS (
+                SELECT 1 FROM BS_EFFICIENCY_TASK ts
+                LEFT JOIN BLADE_USER bu2 ON ts.report_user = bu2.id
+                WHERE ts.parent_id = t.id
+                AND ts.is_deleted = 0
+                AND bu2.real_name LIKE concat(concat('%', #{bsEfficiencyTask.reportUserName}),'%')))
             </if>
         </where>
         ORDER BY t.year_month desc, t.create_time
@@ -68,10 +80,10 @@
                 and t.type = #{type}
             </if>
             <if test="taskName!=null">
-                and t.task_name like concat(concat('%', #{bsEfficiencyTask.taskName}),'%')
+                and t.task_name like concat(concat('%', #{taskName}),'%')
             </if>
             <if test="reportUserName!=null">
-                and bu.name like concat(concat('%', #{bsEfficiencyTask.reportUserName}),'%')
+                and bu.real_name like concat(concat('%', #{reportUserName}),'%')
             </if>
             <if test="parentId!=null">
                 and t.parent_id = #{parentId}
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTaskServiceImpl.java
index f587afea..7b706d51 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTaskServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTaskServiceImpl.java
@@ -7,7 +7,6 @@ import jakarta.annotation.Resource;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.desk.common.feign.IMesNotifyMessageClient;
 import org.springblade.desk.common.pojo.entity.MesNotifyMessageEntity;
-import org.springblade.desk.common.service.IMesNotifyMessageService;
 import org.springblade.desk.efficiency.enums.BsEfficiencyTaskEnum;
 import org.springblade.desk.efficiency.mapper.BsEfficiencyTaskMapper;
 import org.springblade.desk.efficiency.pojo.dto.BsEfficiencyTaskDTO;
@@ -31,7 +30,7 @@ import java.util.stream.Collectors;
 public class BsEfficiencyTaskServiceImpl extends BaseServiceImpl<BsEfficiencyTaskMapper, BsEfficiencyTaskEntity> implements IBsEfficiencyTaskService {
 
     @Resource
-    private IMesNotifyMessageService mesNotifyMessageService;
+    private IMesNotifyMessageClient mesNotifyMessageClient;
 
     @Override
     public IPage<BsEfficiencyTaskVO> selectBsEfficiencyTaskPage(IPage<BsEfficiencyTaskVO> page, BsEfficiencyTaskVO bsEfficiencyTask) {
@@ -41,6 +40,8 @@ public class BsEfficiencyTaskServiceImpl extends BaseServiceImpl<BsEfficiencyTas
             BsEfficiencyTaskDTO sub = new BsEfficiencyTaskDTO();
             sub.setParentId(bsEfficiencyTaskVO.getId());
             sub.setType("2");
+            sub.setTaskName(bsEfficiencyTask.getTaskName());
+            sub.setReportUserName(bsEfficiencyTask.getReportUserName());
             List<BsEfficiencyTaskVO> subTasks = this.selectBsEfficiencyTaskList(sub);
             bsEfficiencyTaskVO.setSubTasks(subTasks);
         }
@@ -68,7 +69,7 @@ public class BsEfficiencyTaskServiceImpl extends BaseServiceImpl<BsEfficiencyTas
             MesNotifyMessageEntity notifyMessage = new MesNotifyMessageEntity();
             notifyMessage.setContent(msg);
             notifyMessage.setReceiveUserId(reportUser);
-            mesNotifyMessageService.save(notifyMessage);
+            mesNotifyMessageClient.save(notifyMessage);
         }
     }
 
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java
index a52670e3..5ef6a2be 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/efficiency/service/impl/BsEfficiencyTempServiceImpl.java
@@ -4,11 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import jakarta.annotation.Resource;
 import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.desk.common.feign.IMesNotifyMessageClient;
 import org.springblade.desk.common.pojo.entity.MesNotifyMessageEntity;
-import org.springblade.desk.common.service.IMesNotifyMessageService;
 import org.springblade.desk.efficiency.enums.BsEfficiencyTaskEnum;
 import org.springblade.desk.efficiency.mapper.BsEfficiencyTempMapper;
 import org.springblade.desk.efficiency.pojo.entity.BsEfficiencyTaskEntity;
@@ -20,7 +18,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import java.time.LocalDate;
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 
@@ -36,7 +33,7 @@ public class BsEfficiencyTempServiceImpl extends BaseServiceImpl<BsEfficiencyTem
     @Resource
     private IBsEfficiencyTaskService bsEfficiencyTaskService;
     @Resource
-    private IMesNotifyMessageService mesNotifyMessageService;
+    private IMesNotifyMessageClient mesNotifyMessageClient;
 
     @Override
     public IPage<BsEfficiencyTempVO> selectBsEfficiencyTempPage(IPage<BsEfficiencyTempVO> page, BsEfficiencyTempVO bsEfficiencyTemp) {
@@ -47,9 +44,10 @@ public class BsEfficiencyTempServiceImpl extends BaseServiceImpl<BsEfficiencyTem
     public R taskAssignment(Long id) {
         BsEfficiencyTempEntity bsEfficiencyTemp = this.getById(id);
         if (bsEfficiencyTemp == null) {
-            if (bsEfficiencyTemp != null) {
-                return R.fail("绩效模板查询失败");
-            }
+            return R.fail("绩效模板查询失败");
+        }
+        if (bsEfficiencyTemp.getIsDeleted() != 0) {
+            return R.fail("绩效模板已删除");
         }
         LocalDate lastMonthDate = LocalDate.now().minusMonths(1);
         String year = String.valueOf(lastMonthDate.getYear());
@@ -129,7 +127,7 @@ public class BsEfficiencyTempServiceImpl extends BaseServiceImpl<BsEfficiencyTem
             MesNotifyMessageEntity notifyMessage = new MesNotifyMessageEntity();
             notifyMessage.setContent(msg);
             notifyMessage.setReceiveUserId(bsEfficiencyTemp.getReportUser());
-            mesNotifyMessageService.save(notifyMessage);
+            mesNotifyMessageClient.save(notifyMessage);
         }
     }