From 92dedb21bb2b6479f2cc02e64a99f4bf6d0b3ded Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Thu, 20 Feb 2020 19:33:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E9=83=A8=E8=AF=84=E4=BB=B7=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/evaluate/EvaluateInfoDao.xml     | 2 +-
 .../src/main/resources/mapper/evaluate/EvaluateOptionDao.xml   | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
index 6c82a65cb..8f5a05b6f 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateInfoDao.xml
@@ -52,7 +52,7 @@
         <if test="id != null and id != ''">
             and info.OFFICER_ID = #{id}
         </if>
-        <if test="roleCode != null and roleCode != ''">
+        <if test='roleCode != null and roleCode != "" and roleCode != "0"'>
             and info.ROLE_CODE = #{roleCode}
         </if>
         <if test="fullName != null and fullName != ''">
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml
index bbf9f6b2c..81e44b29f 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/evaluate/EvaluateOptionDao.xml
@@ -42,6 +42,9 @@
         <if test='roleCode != null and roleCode != "" and roleCode != "0"'>
             and ROLE_CODE = #{roleCode}
         </if>
+        <if test='available != null and available != "" '>
+            and AVAILABLE = #{available}
+        </if>
         order by sort, UPDATED_TIME desc
     </select>