--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/mapper/workmanagement/WorkManagementMapper.java

@@ -30,7 +30,7 @@ public interface WorkManagementMapper extends BaseMapper<WorkManagement>{
 	 * @date 2020年7月15日 下午2:33:32
 	 */
 	@Select("<script>"
-		    + " select DISTINCT be.id,name,company,phone,case when companytype = 1 then '单项作品' else '系列作品' end companytype,"
+		    + " select DISTINCT be.id,( select GROUP_CONCAT(typename) from res_diy_type a where a.code in (select db.code from  res_work_management_diy_type db where be.id = db.workId)) diyType,name,company,phone,case when companytype = 1 then '单项作品' else '系列作品' end companytype,"
 		    + " serieschinesename,workstatus,case when workstatus = 1 then '已上架' else '已下架' end status_zh,"
 		    + " (select cover from res_work_management_img b where imgtype ='1' and b.workWorkId = (select id from res_work_management_work a where a.workId = be.id and imgsort = 1 ) LIMIT 1) cover   "
 		    + " from res_work_management be LEFT JOIN res_work_management_diy_type bdt ON be.id = bdt.workId  "