添加修改

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

@@ -275,20 +275,29 @@
         ccl.id,
         ccl.name,
         ccl.area,
-        "集团" AS deptName,
-        "张三" AS createName,
+        max(dp.dic_name) AS area,
+        GROUP_CONCAT(DISTINCT cc.category_name SEPARATOR ', ') AS categoryNames,
         ccl.term_of_validity AS termOfValidity,
         ccl.approve_status AS approveStatus,
         ccl.last_update_time as approveTime,
+        ccl.create_by,
+        ccl.apply_dept_id,
         ccl.remark
         from cosco_category_library_supplier ccls
           left join cosco_category_library_supplier_apply cclsa on cclsa.id = ccls.category_library_supplier_apply_id
           left join cosco_category_library  ccl on ccls.category_library_id = ccl.id
+        LEFT JOIN
+        cosco_category_library_contain cclc ON ccl.id = cclc.category_library_id
+        LEFT JOIN
+        cosco_category cc ON cc.id = cclc.category_id and cc.type=1
+        left join dict_project dp on ccl.area = dp.code and dp.parent_code='area'
+
         where cclsa.approve_status = 1 and ccls.supplier_id = #{vo.supplierId}
+
         <if test="vo.name!=null and vo.name!=''">
             AND ccl.name LIKE CONCAT('%',#{vo.name},'%')
         </if>
-
+        group by ccl.id
     </select>
 
 </mapper>