From a4f932c6ca705feb3bee3b7d7bbe0ee5c0c85515 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期五, 29 十二月 2023 09:41:11 +0800
Subject: [PATCH] 修改

---
 modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml |    8 ++++----
 1 files changed, 4 insertions(+), 4 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..8323d84 100644
--- a/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
+++ b/modules/mainPart/src/main/resources/mapper/project/EnvironDao.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <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.software_name,p.software_identity
+        FROM environ 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