From 2c89ccdc9e008060f8cd6608c9fcb014616987a3 Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 20 十一月 2023 10:27:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
index 42eb2ff..dc5a2f0 100644
--- a/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
@@ -4,10 +4,11 @@
<mapper namespace="com.zt.life.modules.project.dao.EnvironDao">
<select id="getList" resultType="com.zt.life.modules.project.model.Environ">
- select a.*
- from environ a
+ SELECT a.*, p.*
+ FROM software_test_order a
+ INNER JOIN project p ON p.id = a.project_id
<where>
- a.is_delete = 0
+ a.is_delete = 0 and p.is_delete = 0
<if test="whereSql!=null">
and ${whereSql}
</if>
--
Gitblit v1.9.1