From 66226c8168ca81e2c8a61eabd5134f4428655ca7 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Mon, 24 Nov 2025 13:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E4=B8=8B=E6=8B=89=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/web/controller/common/CommonSelectController.java    | 2 ++
 bonus-system/src/main/resources/mapper/system/SelectMapper.xml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/common/CommonSelectController.java b/bonus-admin/src/main/java/com/bonus/web/controller/common/CommonSelectController.java
index 666f09e..2bad255 100644
--- a/bonus-admin/src/main/java/com/bonus/web/controller/common/CommonSelectController.java
+++ b/bonus-admin/src/main/java/com/bonus/web/controller/common/CommonSelectController.java
@@ -6,6 +6,7 @@ import com.bonus.web.service.common.CommonSelectService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
@@ -17,6 +18,7 @@ import javax.annotation.Resource;
  * @description:通用下拉选/树
  */
 @RequestMapping("/commonSelect/")
+@RestController
 public class CommonSelectController {
 
     @Resource(name = "CommonSelectService")
diff --git a/bonus-system/src/main/resources/mapper/system/SelectMapper.xml b/bonus-system/src/main/resources/mapper/system/SelectMapper.xml
index 0e6efbc..a858b47 100644
--- a/bonus-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/bonus-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -8,9 +8,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getAnalysisSelects" resultType="com.bonus.common.domain.system.vo.SelectVo">
         SELECT tt.template_id AS id,
                tt.template_name AS name,
-               ttc.file_name AS uploadType
+               GROUP_CONCAT(ttc.file_name) AS uploadType
         FROM tb_template tt
         LEFT JOIN tb_template_composition ttc ON tt.template_id = ttc.template_id AND ttc.composition_type = '1'
         WHERE tt.use_state = '0' AND tt.del_flag = '0'
+        GROUP BY tt.template_id
     </select>
 </mapper>