From fb4b31d87d3d56c807ae2e65938bec6e2a6f05bf Mon Sep 17 00:00:00 2001
From: liuwu <975499773@qq.com>
Date: Fri, 25 Aug 2023 14:01:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/TAmentPartyAffairsController.java    | 13 ++++++++++++-
 .../com/cyx/framework/config/ResourcesConfig.java   |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
index 42a447e..ce63a42 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
@@ -48,6 +48,17 @@ public class TAmentPartyAffairsController extends BaseController
         return prefix + "/affairs";
     }
 
+    /**
+     * 上传图片页面
+     * @return
+     */
+    @RequiresPermissions("base:affairs:view")
+    @GetMapping()
+    public String upload()
+    {
+        return prefix + "/upload";
+    }
+
     /**
      * 党风廉政建设
      * @return
@@ -111,7 +122,7 @@ public class TAmentPartyAffairsController extends BaseController
     public TableDataInfo list(TAmentPartyAffairs tAmentPartyAffairs)
     {
         startPage();
-        List<TAmentPartyAffairs> list = tAmentPartyAffairsService.selectTAmentPartyAffairsListAll(tAmentPartyAffairs);
+        List<TAmentPartyAffairs> list = tAmentPartyAffairsService.selectTAmentPartyAffairsList(tAmentPartyAffairs);
         return getDataTable(list);
     }
 
diff --git a/cyx-framework/src/main/java/com/cyx/framework/config/ResourcesConfig.java b/cyx-framework/src/main/java/com/cyx/framework/config/ResourcesConfig.java
index 713d99c..3e7dfed 100644
--- a/cyx-framework/src/main/java/com/cyx/framework/config/ResourcesConfig.java
+++ b/cyx-framework/src/main/java/com/cyx/framework/config/ResourcesConfig.java
@@ -42,6 +42,7 @@ public class ResourcesConfig implements WebMvcConfigurer
     {
         /** 本地文件上传路径 */
         registry.addResourceHandler(Constants.RESOURCE_PREFIX + "/**").addResourceLocations("file:" + RuoYiConfig.getProfile() + "/");
+        registry.addResourceHandler("/templates/**").addResourceLocations("classpath:/templates/");
 
         /** swagger配置 */
         registry.addResourceHandler("/swagger-ui/**").addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");