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 list = tAmentPartyAffairsService.selectTAmentPartyAffairsListAll(tAmentPartyAffairs); + List 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/");