From 5ab46fd88d9d41daeba0b1fb249c0b1133f43aaf Mon Sep 17 00:00:00 2001
From: zhangtq <2452618307@qq.com>
Date: Wed, 22 Jan 2025 10:03:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=9F=A5=E8=AF=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mappers/evaluate/OrganizationalMapper.xml | 2 +-
 src/main/resources/mappers/evaluate/PersonMapper.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml
index 3260624..6d8bf16 100644
--- a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml
+++ b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml
@@ -197,7 +197,7 @@
     <select id="getUserList" resultType="com.bonus.gs.sub.evaluate.evaluate.beans.OrganizationalBean">
         select NAME userName, LOGIN_NAME idCard, SEX, TELPHONE userPhone, dept_id tableId
           FROM gs_exam.pm_user
-         where IS_ACTIVE = 1
+         where IS_ACTIVE = 1 and  and if_active = '1'
            and dept_id = #{deptId}
     </select>
     <select id="getEvaluatePersonList"
diff --git a/src/main/resources/mappers/evaluate/PersonMapper.xml b/src/main/resources/mappers/evaluate/PersonMapper.xml
index c50d61f..606092f 100644
--- a/src/main/resources/mappers/evaluate/PersonMapper.xml
+++ b/src/main/resources/mappers/evaluate/PersonMapper.xml
@@ -66,7 +66,7 @@
         left join gs_exam.pm_dept pd on pu.DEPT_ID = pd.ID and pd.IS_ACTIVE = '1'
         left join gs_exam.pm_new_role_user pnru on pu.ID = pnru.user_id and pnru.del_flag = '0'
         left join gs_exam.pm_new_role pnr on pnru.ROLE_ID = pnr.id and pnr.del_flag = '0'
-        where pu.IS_ACTIVE = '1' and pu.LOGIN_NAME not in (select id_card from sys_user where status = '1' and id_card is not null)
+        where pu.IS_ACTIVE = '1' and pu.if_active = '1' and pu.LOGIN_NAME not in (select id_card from sys_user where status = '1' and id_card is not null)
         <if test="bean.id != null and bean.id != ''">
             and pu.dept_id in
             <foreach collection="arr" item="id" open="(" close=")" separator=",">