manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

语法变更 getSqlMap() 替换为 sqlMap()

Browse Source
This commit is contained in:
thinkgem
2023-02-23 19:32:45 +08:00
parent b22f4cd5de
commit 2683533a50
8 changed files with 38 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java
View File

@@ -72,11 +72,11 @@ public class Post extends DataEntity<Post> {
}
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 个字符")

2
modules/core/src/main/java/com/jeesite/modules/sys/service/support/CompanyServiceSupport.java
View File

@@ -46,7 +46,7 @@ public class CompanyServiceSupport extends TreeService<CompanyDao, Company>
*/
@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");
}

4
modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
View File

@@ -72,10 +72,10 @@ public class EmpUserServiceSupport extends CrudService<EmpUserDao, EmpUser>
*/
@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");
}
}

2
modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java
View File

@@ -48,7 +48,7 @@ public class OfficeServiceSupport extends TreeService<OfficeDao, Office>
*/
@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");
}

2
modules/core/src/main/java/com/jeesite/modules/sys/web/OfficeController.java
View File

@@ -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<Office> list = officeService.findList(office);
String fileName = "机构数据" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
try(ExcelExport ee = new ExcelExport("机构数据", Office.class)){

2
modules/core/src/main/java/com/jeesite/modules/sys/web/user/CorpAdminController.java
View File

@@ -77,7 +77,7 @@ public class CorpAdminController extends BaseController {
public Page<User> 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));