From 058b462b647448e509416e0d2903edee5a2686c8 Mon Sep 17 00:00:00 2001 From: msgroup Date: Thu, 16 Nov 2023 14:08:20 +0800 Subject: [PATCH] =?UTF-8?q?up=EF=BC=9A5.3.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: mingsoft --- src/main/java/net/mingsoft/MSApplication.java | 2 ++ src/main/java/net/mingsoft/MSServletInitializer.java | 2 ++ src/main/java/net/mingsoft/cms/action/web/MCmsAction.java | 4 ++-- src/main/java/net/mingsoft/cms/biz/IContentBiz.java | 3 +-- .../java/net/mingsoft/cms/biz/impl/ContentBizImpl.java | 6 +++--- src/main/java/net/mingsoft/cms/dao/IContentDao.java | 5 +++-- .../net/mingsoft/cms/resources/resources_zh_CN.properties | 2 +- src/main/webapp/WEB-INF/manager/cms/category/index.ftl | 7 +------ src/main/webapp/static/css/app.css | 2 +- 9 files changed, 16 insertions(+), 17 deletions(-) mode change 100644 => 100755 src/main/java/net/mingsoft/MSApplication.java mode change 100644 => 100755 src/main/java/net/mingsoft/MSServletInitializer.java diff --git a/src/main/java/net/mingsoft/MSApplication.java b/src/main/java/net/mingsoft/MSApplication.java old mode 100644 new mode 100755 index 23212dab..2c03b86f --- a/src/main/java/net/mingsoft/MSApplication.java +++ b/src/main/java/net/mingsoft/MSApplication.java @@ -19,6 +19,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft; import org.mybatis.spring.annotation.MapperScan; diff --git a/src/main/java/net/mingsoft/MSServletInitializer.java b/src/main/java/net/mingsoft/MSServletInitializer.java old mode 100644 new mode 100755 index 1dbdd9e8..45b0119a --- a/src/main/java/net/mingsoft/MSServletInitializer.java +++ b/src/main/java/net/mingsoft/MSServletInitializer.java @@ -19,6 +19,8 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ + + package net.mingsoft; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java index 5eeb4ef0..9236a2fb 100755 --- a/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java +++ b/src/main/java/net/mingsoft/cms/action/web/MCmsAction.java @@ -224,8 +224,8 @@ public class MCmsAction extends net.mingsoft.cms.action.BaseAction { } }); - //查询数量 - int count = contentBiz.getSearchCount(contentModel, fieldValueList, searchMap, BasicUtil.getApp().getAppId(), categoryIds); + //查询数量 站群会自动拼appId区分 + int count = contentBiz.getSearchCount(contentModel, fieldValueList, searchMap, categoryIds); page.setRcount(count); params.put("search", searchMap); diff --git a/src/main/java/net/mingsoft/cms/biz/IContentBiz.java b/src/main/java/net/mingsoft/cms/biz/IContentBiz.java index 56500c0f..50357888 100755 --- a/src/main/java/net/mingsoft/cms/biz/IContentBiz.java +++ b/src/main/java/net/mingsoft/cms/biz/IContentBiz.java @@ -61,11 +61,10 @@ public interface IContentBiz extends IBaseBiz { * @param contentModel 文章模型， * @param diyList 扩展模型字段 List key:自定义模型字段:值 * @param whereMap 条件 - * @param websiteId 站点编号 * @param categoryIds 栏目编号集合 格式：1,2,3 * @return */ - int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, String websiteId, String categoryIds); + int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, String categoryIds); /** * 根据文章属性查询,不包括单篇 * @param contentBean diff --git a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java index fdd32efe..1dc898f8 100755 --- a/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java +++ b/src/main/java/net/mingsoft/cms/biz/impl/ContentBizImpl.java @@ -94,11 +94,11 @@ public class ContentBizImpl extends BaseBizImpl imp } @Override - public int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, String appId, String categoryIds) { + public int getSearchCount(ModelEntity contentModel, List diyList, Map whereMap, String categoryIds) { if (contentModel!=null) { - return contentDao.getSearchCount(contentModel.getModelTableName(),diyList,whereMap, appId,categoryIds); + return contentDao.getSearchCount(contentModel.getModelTableName(),diyList,whereMap, categoryIds); } - return contentDao.getSearchCount(null,null,whereMap, appId,categoryIds); + return contentDao.getSearchCount(null,null,whereMap, categoryIds); } @Override diff --git a/src/main/java/net/mingsoft/cms/dao/IContentDao.java b/src/main/java/net/mingsoft/cms/dao/IContentDao.java index aff0524f..aa257120 100755 --- a/src/main/java/net/mingsoft/cms/dao/IContentDao.java +++ b/src/main/java/net/mingsoft/cms/dao/IContentDao.java @@ -20,6 +20,8 @@ */ + + package net.mingsoft.cms.dao; import net.mingsoft.base.dao.IBaseDao; @@ -70,12 +72,11 @@ public interface IContentDao extends IBaseDao { * @param map * key:字段名 value:List 字段的各种判断值 list[0]:是否为自定义字段 list[1]:是否为整形 * list[2]:是否是等值查询 list[3]:字段的值 - * @param appId 站点id * @param categoryIds 栏目id集合 * @return 文章实体总数 */ int getSearchCount(@Param("tableName") String tableName, @Param("diyList") List diyList, @Param("map") Map map, - @Param("appId") String appId, @Param("categoryIds") String categoryIds); + @Param("categoryIds") String categoryIds); /** * 分类编号删除文章 diff --git a/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties b/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties index c60752be..f97c0c97 100755 --- a/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties +++ b/src/main/java/net/mingsoft/cms/resources/resources_zh_CN.properties @@ -35,5 +35,5 @@ category.diy.url=\u81EA\u5B9A\u4E49\u94FE\u63A5 content.keyword=\u5173\u952E\u5B57 template.file=\u672A\u627E\u5230\u6A21\u677F\u6587\u4EF6 category.pinyin=\u62FC\u97F3 -datetime.format=时间格式 +datetime.format=\u65F6\u95F4\u683C\u5F0F diff --git a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl index 73801628..d8dc126d 100644 --- a/src/main/webapp/WEB-INF/manager/cms/category/index.ftl +++ b/src/main/webapp/WEB-INF/manager/cms/category/index.ftl @@ -42,7 +42,7 @@ @@ -354,8 +354,3 @@ } }); - \ No newline at end of file diff --git a/src/main/webapp/static/css/app.css b/src/main/webapp/static/css/app.css index 743712af..b59ff9d2 100644 --- a/src/main/webapp/static/css/app.css +++ b/src/main/webapp/static/css/app.css @@ -84,7 +84,7 @@ html *, body * { /*搜索*/ .ms-search{ background: #fff; - padding: 10px 14px 0 14px; + padding: 10px 10px 0 10px; border-bottom: 1px dashed #ebeef5; } .ms-search .ms-search-footer{