From 7748cd8a79548e94299d24e080c4650924a215da Mon Sep 17 00:00:00 2001 From: zzw <wander.zheng@qq.com> Date: 星期二, 28 十一月 2023 09:16:20 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml b/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml index d55ed3e..96b2144 100644 --- a/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml +++ b/modules/mainPart/src/main/resources/mapper/project/EnvironSoftwareResourcesDao.xml @@ -2,14 +2,13 @@ <!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.EnvironSoftwareResourcesDao"> - <select id="getList" resultType="com.zt.life.modules.project.model.EnvironSoftwareResources"> select a.* from environ_software_resources a <where> a.is_delete = 0 - <if test="whereSql!=null"> - and ${whereSql} + <if test="environId!=null"> + and environ_id = ${environId} </if> </where> <if test="orderBySql!=null"> -- Gitblit v1.9.1