diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java index aeba73cd..ec0e3e90 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/service/CategoryService.java @@ -4,18 +4,17 @@ */ package com.jeesite.modules.cms.service; -import java.util.List; - -import org.apache.commons.text.StringEscapeUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.jeesite.common.lang.StringUtils; import com.jeesite.common.service.TreeService; import com.jeesite.modules.cms.dao.CategoryDao; import com.jeesite.modules.cms.entity.Category; import com.jeesite.modules.cms.utils.CmsUtils; import com.jeesite.modules.file.utils.FileUploadUtils; +import org.apache.commons.text.StringEscapeUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; /** * 栏目表Service @@ -75,7 +74,7 @@ public class CategoryService extends TreeService { @Override protected void updateChildNode(Category childEntity, Category parentEntity) { childEntity.setSite(parentEntity.getSite()); - childEntity.getSqlMap().updateTreeDataExtSql("site_code = #{site.siteCode}"); + childEntity.sqlMap().updateTreeDataExtSql("site_code = #{site.siteCode}"); super.updateChildNode(childEntity, parentEntity); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java index 1603a6c2..aca087e6 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java @@ -72,11 +72,11 @@ public class Post extends DataEntity { } public String getPostName_like() { - return getSqlMap().getWhere().getValue("post_name", QueryType.LIKE); + return sqlMap().getWhere().getValue("post_name", QueryType.LIKE); } public void setPostName_like(String roleName) { - getSqlMap().getWhere().and("post_name", QueryType.LIKE, roleName); + sqlMap().getWhere().and("post_name", QueryType.LIKE, roleName); } @Size(min=0, max=100, message="岗位分类长度不能超过 100 个字符") diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java index 8a576348..5f536285 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java @@ -46,7 +46,7 @@ public class CompanyServiceSupport extends TreeService */ @Override public void addDataScopeFilter(Company company, String ctrlPermi) { - company.getSqlMap().getDataScope().addFilter("dsf", "Company", "a.company_code", + company.sqlMap().getDataScope().addFilter("dsf", "Company", "a.company_code", null, ctrlPermi, "office_user"); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java index 9fecd403..b88fa3ae 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java @@ -72,10 +72,10 @@ public class EmpUserServiceSupport extends CrudService */ @Override public void addDataScopeFilter(EmpUser empUser, String ctrlPermi) { - empUser.getSqlMap().getDataScope().addFilter("dsfOffice", + empUser.sqlMap().getDataScope().addFilter("dsfOffice", "Office", "e.office_code", "a.create_by", ctrlPermi, "office_user"); if (StringUtils.isNotBlank(EmpUtils.getCompany().getCompanyCode())){ - empUser.getSqlMap().getDataScope().addFilter("dsfCompany", + empUser.sqlMap().getDataScope().addFilter("dsfCompany", "Company", "e.company_code", "a.create_by", ctrlPermi, "office_user"); } } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java index c46b9460..c91e8e64 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java @@ -48,7 +48,7 @@ public class OfficeServiceSupport extends TreeService */ @Override public void addDataScopeFilter(Office office, String ctrlPermi) { - office.getSqlMap().getDataScope().addFilter("dsf", "Office", "a.office_code", + office.sqlMap().getDataScope().addFilter("dsf", "Office", "a.office_code", null, ctrlPermi , "office_user"); } diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java index 9aa60c99..aef958a9 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java @@ -184,7 +184,7 @@ public class OfficeController extends BaseController { if (!(isAll != null && isAll) || Global.isStrictMode()){ officeService.addDataScopeFilter(office, ctrlPermi); } - office.getSqlMap().getOrder().setOrderBy("a.tree_sorts"); + office.sqlMap().getOrder().setOrderBy("a.tree_sorts"); List list = officeService.findList(office); String fileName = "机构数据" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx"; try(ExcelExport ee = new ExcelExport("机构数据", Office.class)){ diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java index 7705d8c8..d84ed8f0 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java @@ -77,7 +77,7 @@ public class CorpAdminController extends BaseController { public Page listData(User user, HttpServletRequest request, HttpServletResponse response) { user.setMgrType(User.MGR_TYPE_CORP_ADMIN); // 租户管理员 // 禁用自动添加租户代码条件，添加自定义租户查询条件 - user.getSqlMap().getWhere().disableAutoAddCorpCodeWhere() + user.sqlMap().getWhere().disableAutoAddCorpCodeWhere() .and("corp_code", QueryType.EQ, user.getCorpCode_()) .and("corp_name", QueryType.LIKE, user.getCorpName_()); user.setPage(new Page<>(request, response)); diff --git a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java index 0c0e5c30..eb45e15a 100644 --- a/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java +++ b/modules/core/src/test/java/com/jeesite/test/DaoMapperTest.java @@ -187,8 +187,8 @@ public class DaoMapperTest extends BaseSpringContextTests { System.out.println("============ 扩展条件语句前带AND容错测试 ============"); Company company5 = new Company(); - company5.getSqlMap().getWhere().disableAutoAddStatusWhere(); - company5.getSqlMap().getDataScope().addFilter("dsf", + company5.sqlMap().getWhere().disableAutoAddStatusWhere(); + company5.sqlMap().getDataScope().addFilter("dsf", "Company", "a.`company_code`", DataScope.CTRL_PERMI_HAVE); List companyList = companyDao.findList(company5); System.out.println(companyList); @@ -196,7 +196,7 @@ public class DaoMapperTest extends BaseSpringContextTests { System.out.println("============ 联合查询未设定columns和attrName为this时测试 ============"); FileUpload fileUpload = new FileUpload(); - fileUpload.getSqlMap().getWhere().and("u.`user_name`", QueryType.EQ, "user1"); + fileUpload.sqlMap().getWhere().and("u.`user_name`", QueryType.EQ, "user1"); List fileUploadList = fileUploadDao.findList(fileUpload); System.out.println(fileUploadList); Assert.assertEquals("fileUploadDao.findList attrName this", fileUploadList.size(), 0); @@ -227,52 +227,52 @@ public class DaoMapperTest extends BaseSpringContextTests { public static void main(String[] args) { String a = null, b = null; System.out.println("============ 基本测试 ============"); - a = new Config("1").getSqlMap() + a = new Config("1").sqlMap() .getWhere().and("name", QueryType.EQ, "abc").toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1} AND a.name = #{sqlMap.where.name#EQ1.val}"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .and("name", QueryType.IN, new String[]{"1", "2", "3"}).toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1} AND a.name IN ( #{sqlMap.where.name#IN1.val[0]}," + " #{sqlMap.where.name#IN1.val[1]}, #{sqlMap.where.name#IN1.val[2]} )"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .or("name", QueryType.IN, new String[]{"1", "2", "3"}).toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1} OR a.name IN ( #{sqlMap.where.name#IN1.val[0]}," + " #{sqlMap.where.name#IN1.val[1]}, #{sqlMap.where.name#IN1.val[2]} )"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); System.out.println("============ 重复赋值测试 ============"); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .and("name", QueryType.LIKE, "abc").and("name", QueryType.LIKE, "def").toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1} AND a.name LIKE #{sqlMap.where.name#LIKE1.val}"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); System.out.println("============ IN、NOT IN 测试 ============"); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .and("name", QueryType.IN, new String[]{"abc","def"}) .and("name2", QueryType.NOT_IN, ListUtils.newArrayList("abc","def")).toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1} AND a.name IN ( #{sqlMap.where.name#IN1.val[0]}, #{sqlMap.where.name#IN1.val[1]} )" + " AND a.name2 NOT IN ( #{sqlMap.where.name2#NOT_IN1.val[0]}, #{sqlMap.where.name2#NOT_IN1.val[1]} )"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .and("name", QueryType.IN, null).and("name2", QueryType.IN, new String[]{}) .and("name3", QueryType.NOT_IN, ListUtils.newArrayList()).toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1}"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); System.out.println("============ 带括号测试 ============"); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .andBracket("name", QueryType.EQ, "abc", 1).or("name", QueryType.EQ, "def", 2) .or("name", QueryType.EQ, "ghi", 3).endBracket().toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1} AND ( a.name = #{sqlMap.where.name#EQ1.val}" + " OR a.name = #{sqlMap.where.name#EQ2.val} OR a.name = #{sqlMap.where.name#EQ3.val} )"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); - a = new Config().getSqlMap().getWhere() + a = new Config().sqlMap().getWhere() .andBracket("name", QueryType.EQ, "val1", 1).and("name", QueryType.NE, "val2", 11).endBracket(1) .orBracket("name", QueryType.NE, "val3", 2).and("name", QueryType.NE, "val4", 22).endBracket(2) .orBracket("name", QueryType.NE, "val5", 3).and("name", QueryType.EQ, "val6", 33).endBracket(3) @@ -283,20 +283,20 @@ public class DaoMapperTest extends BaseSpringContextTests { System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); System.out.println("============ 带括号部分空值测试 ============"); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "def", 2) .or("name", QueryType.EQ, "", 3).endBracket().toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1} AND ( a.name = #{sqlMap.where.name#EQ2.val} )"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .andBracket("name", QueryType.EQ, "abc", 1).or("name", QueryType.EQ, "def", 2) .or("name", QueryType.EQ, "", 3).endBracket().toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1} AND ( a.name = #{sqlMap.where.name#EQ1.val}" + " OR a.name = #{sqlMap.where.name#EQ2.val} )"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "def", 2) .or("name", QueryType.EQ, "ghi", 3).endBracket().toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1} AND ( a.name = #{sqlMap.where.name#EQ2.val}" @@ -304,13 +304,13 @@ public class DaoMapperTest extends BaseSpringContextTests { System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); System.out.println("============ 带括号全部空值测试 ============"); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "", 2) .or("name", QueryType.EQ, "", 3).endBracket().toSql(); b = "a.`id` = #{sqlMap.where#id#EQ1} "; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); - a = new Config().getSqlMap().getWhere() + a = new Config().sqlMap().getWhere() .andBracket("name", QueryType.EQ, "", 1).or("name", QueryType.EQ, "", 2) .or("name", QueryType.EQ, "", 3).endBracket().toSql(); b = ""; @@ -324,8 +324,8 @@ public class DaoMapperTest extends BaseSpringContextTests { company.getArea().setAreaName("a"); company.getArea().setCreateDate_gte(new Date()); company.getArea().setCreateDate_lte(new Date()); - company.getSqlMap().getWhere().disableAutoAddStatusWhere(); - a = company.getSqlMap().getWhere().toSql(); + company.sqlMap().getWhere().disableAutoAddStatusWhere(); + a = company.sqlMap().getWhere().toSql(); b = "a.`company_code` = #{sqlMap.where#company_code#EQ1}" + " AND a.`area_code` = #{sqlMap.where#area_code#EQ1}" + " AND a.create_date >= #{sqlMap.where.create_date#GTE1.val}" @@ -336,14 +336,14 @@ public class DaoMapperTest extends BaseSpringContextTests { System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); System.out.println("============ 联合查询，属性名支持指定别名 ============"); - a = new FileUpload().getSqlMap().getWhere().and("u.`user_name`", QueryType.EQ, "user1").toSql(); + a = new FileUpload().sqlMap().getWhere().and("u.`user_name`", QueryType.EQ, "user1").toSql(); b = "a.`status` != #{STATUS_DELETE} AND u.`user_name` = #{sqlMap.where.u#_user_name_#EQ1.val}"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); System.out.println("============ 联合查询，返回到当前实体测试 ============"); FileUpload fileUpload = new FileUpload(); - fileUpload.getSqlMap().getWhere().and("create_by", QueryType.IN, new String[]{"user1","user2"}); - a = fileUpload.getSqlMap().getWhere().toSql(); + fileUpload.sqlMap().getWhere().and("create_by", QueryType.IN, new String[]{"user1","user2"}); + a = fileUpload.sqlMap().getWhere().toSql(); b = "a.`status` != #{STATUS_DELETE} AND a.create_by IN ( #{sqlMap.where.create_by#IN1.val[0]}," + " #{sqlMap.where.create_by#IN1.val[1]} )"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); @@ -351,14 +351,14 @@ public class DaoMapperTest extends BaseSpringContextTests { System.out.println("============ 联合查询，属性为this时也可作为查询条件 ============"); FileUpload fileUpload2 = new FileUpload(); fileUpload2.setCreateByName("ThinkGem/JeeSite"); - fileUpload2.getSqlMap().getWhere().and("create_by", QueryType.IN, new String[]{"user1","user2"}); - a = fileUpload2.getSqlMap().getWhere().toSql(); + fileUpload2.sqlMap().getWhere().and("create_by", QueryType.IN, new String[]{"user1","user2"}); + a = fileUpload2.sqlMap().getWhere().toSql(); b = "a.`status` != #{STATUS_DELETE} AND a.create_by IN ( #{sqlMap.where.create_by#IN1.val[0]}," + " #{sqlMap.where.create_by#IN1.val[1]} ) AND u.`user_name` LIKE #{sqlMap.where#user_name#LIKE1}"; System.out.println("a >> "+a);System.out.println("b >> "+b);Assert.assertEquals(a, b); System.out.println("============ 条件嵌套查询，可替代 andBracket、orBracket、endBracket v5.2.1+ ============"); - a = new Config("1").getSqlMap().getWhere() + a = new Config("1").sqlMap().getWhere() .and("name", QueryType.EQ, "abc", 1) .and((w) -> w .or("name", QueryType.EQ, "def", 2)