From ae264f2f867e0e70db758b46abfcc4bd12693abf Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Sun, 7 Apr 2024 17:09:27 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8E=AF=E5=A2=83=E5=BC=82=E5=B8=B8=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E6=94=B9=E5=BD=BB=E5=BA=95=E3=80=82=20=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E8=BF=98=E6=98=AF=E5=BA=94=E7=94=A8=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E4=B8=AD=E7=9A=84=E9=85=8D=E7=BD=AE=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1118114022916096]发布添加环境异常，没改彻底。 用的还是应用环境模型中的配置项 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1118114022916096
---
 .../module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml
index 8cce2084..3e3355d1 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml
@@ -114,8 +114,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         cgai.sort as itemSort
         from cmdb_global_attr cga left join cmdb_global_attritem cgai on cga.id = cgai.attr_id
         <where>
+            <if test="name != null and name != ''">
+                and cga.name = #{name}
+            </if>
             <if test="isActive != null">
-                is_active = #{isActive}
+                and cga.is_active = #{isActive}
             </if>
         </where>
         order by cga.id desc, cgai.sort
-- 
Gitee