修改数据

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

@@ -897,7 +897,7 @@
         SELECT
         csb.id,
         MAX(csb.name) AS name,
-        csb.social_credit_code AS socialCreditCode,
+        MAX(csb.social_credit_code) AS socialCreditCode,
         MAX(cas.dept_id) AS deptId,
         MAX(caw.id) AS accessWorkId,
         MAX(caw.update_time) AS admissionTime,
@@ -941,6 +941,7 @@
         LEFT JOIN (
         SELECT
         casc.supplier_id,
+        GROUP_CONCAT(casc.category_id SEPARATOR ', ') AS categoryId,
         GROUP_CONCAT(cc.category_name SEPARATOR ', ') AS categoryName
         FROM
         cosco_access_supplier_category casc
@@ -987,6 +988,16 @@
             </foreach>
         </if>
         )
+        <if test="vo.name!=null and vo.name!=''">
+            and csb.name like concat('%',#{vo.name},'%')
+        </if>
+        <if test="vo.deptId!=null and vo.deptId!=''">
+            and cas.dept_id = #{vo.deptId}
+        </if>
+        <if test="vo.categoryId!=null and vo.categoryId!=''">
+            and category_info.categoryId like concat('%',#{vo.categoryId},'%')
+        </if>
+
 
         GROUP BY
         csb.id