From 52f8faddab554ba718cfcfc0678438b0791ee3fe Mon Sep 17 00:00:00 2001
From: ruanqi <qi.ruan@xujiesoft.com>
Date: Wed, 16 Oct 2024 17:49:29 +0800
Subject: [PATCH] 1127

---
 src/main/resources/mapper/base/PropertiesMapper.xml | 3 +++
 src/main/resources/mapper/sys/SysUserDao.xml        | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/base/PropertiesMapper.xml b/src/main/resources/mapper/base/PropertiesMapper.xml
index 9e21fe0e..a9cd73e2 100644
--- a/src/main/resources/mapper/base/PropertiesMapper.xml
+++ b/src/main/resources/mapper/base/PropertiesMapper.xml
@@ -31,6 +31,9 @@
             <if test="query.itemDesc != null and query.itemDesc != ''">
                 AND ppi.ItemDesc LIKE '%' + #{query.itemDesc} + '%'
             </if>
+               <if test="query.valueType != null and query.valueType != ''">
+                AND ppi.valueType LIKE '%' + #{query.valueType} + '%'
+            </if>
         </where>
         order by ppi.ItemType, ppi.ItemNo
     </select>
diff --git a/src/main/resources/mapper/sys/SysUserDao.xml b/src/main/resources/mapper/sys/SysUserDao.xml
index cddb2a7c..dec68698 100644
--- a/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/src/main/resources/mapper/sys/SysUserDao.xml
@@ -67,7 +67,8 @@
 		    a.language_default,
 		    b.bu_desc,
 		    c.department_name,
-		    d.post_name
+		    d.post_name,
+		    a.domain_Control_Account
 		from sys_user a
 		    left join dbo.BU b on a.bu_no=b.bu_no and a.site = b.site
 		    left join dbo.department c on a.department_no=c.department_no and a.site = c.site