修改统一表前缀管理

This commit is contained in:
TinyAnts
2022-07-14 16:23:00 +08:00
parent 082d64655e
commit 97432dbd71
9 changed files with 27 additions and 27 deletions

View File

@@ -104,8 +104,8 @@ public class ArticleCateServiceImpl implements IArticleCateService {
ArticleCategory model = articleCategoryMapper.selectOne(
new QueryWrapper<ArticleCategory>()
.select(ArticleCategory.class, info->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", id)
.eq("is_delete", 0));
@@ -147,8 +147,8 @@ public class ArticleCateServiceImpl implements IArticleCateService {
ArticleCategory model = articleCategoryMapper.selectOne(
new QueryWrapper<ArticleCategory>()
.select(ArticleCategory.class, info->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", categoryParam.getId())
.eq("is_delete", 0));
@@ -171,8 +171,8 @@ public class ArticleCateServiceImpl implements IArticleCateService {
ArticleCategory model = articleCategoryMapper.selectOne(
new QueryWrapper<ArticleCategory>()
.select(ArticleCategory.class, info->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", id)
.eq("is_delete", 0));

View File

@@ -9,6 +9,7 @@ import com.hxkj.admin.validate.article.ArticleParam;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.common.article.ArticleDetailVo;
import com.hxkj.admin.vo.common.article.ArticleListVo;
import com.hxkj.common.config.GlobalConfig;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.article.Article;
import com.hxkj.common.entity.article.ArticleCategory;
@@ -53,7 +54,7 @@ public class ArticleTextServiceImpl implements IArticleTextService {
MPJQueryWrapper<Article> mpjQueryWrapper = new MPJQueryWrapper<Article>()
.selectAll(Article.class)
.select("ac.name as category")
.innerJoin("ls_article_category ac ON ac.id=t.cid")
.innerJoin("?_article_category ac ON ac.id=t.cid".replace("?_", GlobalConfig.tablePrefix))
.eq("t.is_delete", 0)
.orderByDesc(Arrays.asList("t.sort", "t.id"));
@@ -89,8 +90,8 @@ public class ArticleTextServiceImpl implements IArticleTextService {
Article model = articleMapper.selectOne(
new QueryWrapper<Article>()
.select(Article.class, info->
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
!info.getColumn().equals("is_delete") &&
!info.getColumn().equals("delete_time"))
.eq("id", id)
.eq("is_delete", 0));

View File

@@ -16,6 +16,7 @@ import com.hxkj.admin.validate.system.SystemAdminParam;
import com.hxkj.admin.vo.system.SystemAdminVo;
import com.hxkj.admin.vo.system.SystemRoleVo;
import com.hxkj.admin.vo.system.SystemSelfVo;
import com.hxkj.common.config.GlobalConfig;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemAdmin;
import com.hxkj.common.entity.system.SystemMenu;
@@ -77,8 +78,8 @@ public class SystemAdminServiceImpl implements ISystemAdminService {
"sd.name as dept,sr.name as role,t.is_multipoint,t.is_disable," +
"t.last_login_ip,t.last_login_time,t.create_time,t.update_time")
.eq("t.is_delete", 0)
.leftJoin("ls_system_role sr ON sr.id=t.role")
.leftJoin("ls_system_dept sd ON sd.id=t.dept_id")
.leftJoin("?_system_role sr ON sr.id=t.role".replace("?_", GlobalConfig.tablePrefix))
.leftJoin("?_system_dept sd ON sd.id=t.dept_id".replace("?_", GlobalConfig.tablePrefix))
.orderByDesc(Arrays.asList("t.id", "t.sort"));
systemAdminMapper.setSearch(mpjQueryWrapper, params, new String[]{

View File

@@ -8,6 +8,7 @@ import com.hxkj.admin.service.system.ISystemLogServer;
import com.hxkj.admin.validate.common.PageParam;
import com.hxkj.admin.vo.system.LogLoginVo;
import com.hxkj.admin.vo.system.LogOperateVo;
import com.hxkj.common.config.GlobalConfig;
import com.hxkj.common.core.PageResult;
import com.hxkj.common.entity.system.SystemLogLogin;
import com.hxkj.common.entity.system.SystemLogOperate;
@@ -51,7 +52,7 @@ public class SystemLogServerImpl implements ISystemLogServer {
MPJQueryWrapper<SystemLogOperate> mpjQueryWrapper = new MPJQueryWrapper<SystemLogOperate>()
.selectAll(SystemLogOperate.class)
.select("sa.username,sa.nickname")
.leftJoin("ls_system_admin sa ON sa.id=t.admin_id")
.leftJoin("?_system_admin sa ON sa.id=t.admin_id".replace("?_", GlobalConfig.tablePrefix))
.orderByDesc("id");
logOperateMapper.setSearch(mpjQueryWrapper, params, new String[]{