From aa33bb96ba9f14b16c6c7832e21bfbd88983ba6d Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 24 一月 2024 18:02:39 +0800
Subject: [PATCH] zjh 2024/01/24--3
---
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
index 0d20f6b..6c60a6c 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjProjectMapper.java
@@ -106,14 +106,14 @@
@Select("SELECT DISTINCT d.* from (\n" +
"\tSELECT * FROM `tj_project` a\n" +
- "\twhere a.pro_parent_id=0 \n" +
+ "\twhere a.pro_parent_id=0 and a.deleted=0 \n" +
"\tand (case WHEN #{proName} is NOt NULL THEN a.pro_name like concat('%',#{proName},'%') ELSE 1=1 END)\n" +
"\tand (case WHEN #{checkType} is NOt NULL THEN a.pro_check_type=#{checkType} ELSE 1=1 END)\n" +
"\tand (case WHEN #{deptId} is NOt NULL THEN a.dept_id=#{deptId} ELSE 1=1 END)\n" +
"UNION \n" +
"\tSELECT b.* FROM `tj_project` b JOIN(\n" +
"\tSELECT * FROM `tj_project` a\n" +
- "\twhere a.pro_parent_id!=0\n" +
+ "\twhere a.pro_parent_id!=0 and a.deleted=0\n" +
"\tand (case WHEN #{proName} is NOt NULL THEN a.pro_name like concat('%',#{proName},'%') ELSE 1=1 END)\n" +
"\tand (case WHEN #{checkType} is NOt NULL THEN a.pro_check_type=#{checkType} ELSE 1=1 END)\n" +
"\tand (case WHEN #{deptId} is NOt NULL THEN a.dept_id=#{deptId} ELSE 1=1 END)\n" +
--
Gitblit v1.8.0