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>