From 9327268d9580007afb8fc3fe5dd2841aee3832a7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 07 Jul 2022 15:15:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/farmer-cms

---
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java |    3 ++-
 src/main/resources/mapper/ArticleMapper.xml                                                |    2 +-
 src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java        |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
index 58c80e2..dc2c206 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/CmsTemplateServiceImpl.java
@@ -155,6 +155,7 @@
         Long companyId = LoginUserUtil.getCompanyId();
         QueryWrapper<CmsTemplateEntity> objectQueryWrapper = new QueryWrapper<>();
         objectQueryWrapper.eq("company_id",companyId);
+        objectQueryWrapper.eq("company_id",companyId);
         List<CmsTemplateEntity> cmsTemplateEntities = this.baseMapper.selectList(objectQueryWrapper);
         return Result.ok(cmsTemplateEntities);
     }
@@ -169,7 +170,7 @@
         String baseUrl = cmsProperties.getBaseUrl();
         String templatePath = cmsProperties.getTemplatePath();
         String htmlUrl = baseUrl + templatePath;
-        String pathName = htmlUrl + "\\" + cmsTemplateEntity.getPath();
+        String pathName = htmlUrl + "/" + cmsTemplateEntity.getPath();
 
         byte[] bytes = new byte[0];
         try {
diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
index ffe82d9..7541027 100644
--- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
+++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/UserServiceImpl.java
@@ -424,6 +424,7 @@
 
         QueryWrapper<ArticleEntity> articleQueryWrapper = new QueryWrapper<>();
         articleQueryWrapper.eq("company_id",companyId);
+        articleQueryWrapper.eq("del_status",ArticleEntity.DELETE_STATUS_NO);
         adminHomePageInfoVo.setArticleNum(articleMapper.selectCount(articleQueryWrapper));
 
         QueryWrapper<MessageBoardEntity> messageQueryWrapper = new QueryWrapper<>();
diff --git a/src/main/resources/mapper/ArticleMapper.xml b/src/main/resources/mapper/ArticleMapper.xml
index ec1e9d3..61fc59f 100644
--- a/src/main/resources/mapper/ArticleMapper.xml
+++ b/src/main/resources/mapper/ArticleMapper.xml
@@ -22,7 +22,7 @@
                     and a.title like concat ('%',#{record.title},'%')
                 </if>
                 <if test="record.columnIds != null">
-                    and a.column_id =
+                    and a.column_id in
                     <foreach collection="record.columnIds" separator="," close=")" open="(" item="item">
                         #{item}
                     </foreach>

--
Gitblit v1.9.1