修改错误问题

src/main/resources/com/chinaunicom/zyhy/ebtp/coscoCategory/dao/mapper/CoscoCategoryLibraryContainMapper.xml

@@ -115,4 +115,10 @@
                                 where cclc.category_library_id = #{libraryId} and cc.type=1
     </select>
 
+    <select id="selectSupplierIdByLibraryId" parameterType="string" resultType="string">
+        select cclc.supplier_id
+        from cosco_category_library_contain cclc
+        where cclc.category_library_id = #{libraryId}
+    </select>
+
 </mapper>

src/main/resources/com/chinaunicom/zyhy/ebtp/supplier/base/dao/mapper/CoscoSupplierBaseMapper.xml

@@ -958,13 +958,6 @@
         AND tsk2.approve_status = 1
         AND ts2.del_flag = 'normal'
         AND tsk2.del_flag = 'normal'
-        -- 添加当前搜索部门上下所有id
-        <if test="vo.deptList != null and vo.deptList.size > 0">
-            AND tsk2.dept_id IN
-            <foreach item="dept" collection="vo.deptList" open="(" separator="," close=")">
-                #{dept}
-            </foreach>
-        </if>
         )
         ) ets ON ets.supplier_id = csb.id
         -- 黑名单排除
@@ -996,7 +989,18 @@
         <if test="vo.levelName!=null and vo.levelName!=''">
             and ets.level_name = #{vo.levelName}
         </if>
-
+        <if test="vo.librarySupplierIdList!=null and vo.librarySupplierIdList.size>0">
+            and t.id IN
+            <foreach item="id" collection="vo.librarySupplierIdList" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+        <if test="vo.deptList != null and vo.deptList.size > 0">
+            AND t.dept_id IN
+            <foreach item="dept" collection="vo.deptList" open="(" separator="," close=")">
+                #{dept}
+            </foreach>
+        </if>
         ) t
         WHERE t.rn = 1