瀏覽代碼

给资源的几个接口,组织以及资源类型,做数据处理,如果没有二级三级去掉拼接符号

honorfire 5 月之前
父節點
當前提交
566b1b407d

+ 8 - 8
snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseAuditRecordMapper.xml

@@ -19,8 +19,8 @@
             IFNULL (t42.NAME,'') AS collegeTwoIdName,
             IFNULL (t1.COLLEGE_THREE_ID,'') AS collegeThreeId,
             IFNULL (t43.NAME,'') AS collegeThreeIdName,
-            IFNULL (CONCAT(t1.COLLEGE_ID,',',t1.COLLEGE_TWO_ID,',',t1.COLLEGE_THREE_ID),'') AS collegeAllId,
-            IFNULL (CONCAT(t4.NAME,',',t42.NAME,',',t43.NAME),'') AS collegeAllIdName,
+            IFNULL (RTRIM(CONCAT(t1.COLLEGE_ID,',',t1.COLLEGE_TWO_ID,',',t1.COLLEGE_THREE_ID),','),'') AS collegeAllId,
+            IFNULL (RTRIM(CONCAT(t4.NAME,',',t42.NAME,',',t43.NAME),','),'') AS collegeAllIdName,
             IFNULL (t1.MAJOR_ID,'') AS majorId,
             IFNULL (t5.major_name,'') AS majorIdName,
             IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
@@ -29,8 +29,8 @@
             IFNULL (rt2.NAME,'') AS resourceTwoTypeName,
             IFNULL (t1.RESOURCE_THREE_TYPE,'') AS resourceThreeType,
             IFNULL (rt3.NAME,'') AS resourceThreeTypeName,
-            IFNULL (CONCAT(t1.RESOURCE_TYPE,',',t1.RESOURCE_TWO_TYPE,',',t1.RESOURCE_THREE_TYPE),'') AS resourceAllType,
-            IFNULL (CONCAT(rt.NAME,',',rt2.NAME,',',rt3.NAME),'') AS resourceALLTypeName,
+            IFNULL (RTRIM(CONCAT(t1.RESOURCE_TYPE,',',t1.RESOURCE_TWO_TYPE,',',t1.RESOURCE_THREE_TYPE),','),'') AS resourceAllType,
+            IFNULL (RTRIM(CONCAT(rt.NAME,',',rt2.NAME,',',rt3.NAME),','),'') AS resourceALLTypeName,
             IFNULL (t1.COURSE_ID,'') as courseId,
             IFNULL (t3.COURSE_NAME,'') AS courseIdName,
             IFNULL (TRIM(t1.IS_RECOMMEND),'') AS isRecommend,
@@ -207,8 +207,8 @@
             IFNULL (t42.NAME,'') AS collegeTwoIdName,
             IFNULL (t1.COLLEGE_THREE_ID,'') AS collegeThreeId,
             IFNULL (t43.NAME,'') AS collegeThreeIdName,
-            IFNULL (CONCAT(t1.COLLEGE_ID,',',t1.COLLEGE_TWO_ID,',',t1.COLLEGE_THREE_ID),'') AS collegeAllId,
-            IFNULL (CONCAT(t4.NAME,',',t42.NAME,',',t43.NAME),'') AS collegeAllIdName,
+            IFNULL (RTRIM(CONCAT(t1.COLLEGE_ID,',',t1.COLLEGE_TWO_ID,',',t1.COLLEGE_THREE_ID),','),'') AS collegeAllId,
+            IFNULL (RTRIM(CONCAT(t4.NAME,',',t42.NAME,',',t43.NAME),','),'') AS collegeAllIdName,
             IFNULL (t1.MAJOR_ID,'') AS majorId,
             IFNULL (t5.major_name,'') AS majorIdName,
             IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
@@ -217,8 +217,8 @@
             IFNULL (rt2.NAME,'') AS resourceTwoTypeName,
             IFNULL (t1.RESOURCE_THREE_TYPE,'') AS resourceThreeType,
             IFNULL (rt3.NAME,'') AS resourceThreeTypeName,
-            IFNULL (CONCAT(t1.RESOURCE_TYPE,',',t1.RESOURCE_TWO_TYPE,',',t1.RESOURCE_THREE_TYPE),'') AS resourceAllType,
-            IFNULL (CONCAT(rt.NAME,',',rt2.NAME,',',rt3.NAME),'') AS resourceALLTypeName,
+            IFNULL (RTRIM(CONCAT(t1.RESOURCE_TYPE,',',t1.RESOURCE_TWO_TYPE,',',t1.RESOURCE_THREE_TYPE),','),'') AS resourceAllType,
+            IFNULL (RTRIM(CONCAT(rt.NAME,',',rt2.NAME,',',rt3.NAME),','),'') AS resourceALLTypeName,
             IFNULL (t1.KEYWORD ,'') as keyword,
             IFNULL (t1.KEYWORD_VALUE  ,'') as keywordValue,
             IFNULL (t1.COURSE_ID,'') as courseId,