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

Merge branch 'v5.springboot3' into v5.springboot3.temp

Browse Source
This commit is contained in:
thinkgem
2025-08-18 17:14:14 +08:00
parent 35b0411198 6b75fe67af
commit 4a881825e9
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,7 @@ import com.jeesite.common.config.Global;
import com.jeesite.common.entity.Page; import com.jeesite.common.entity.Page;
import com.jeesite.common.idgen.IdGen; import com.jeesite.common.idgen.IdGen;
import com.jeesite.common.lang.StringUtils; import com.jeesite.common.lang.StringUtils;
import com.jeesite.common.mybatis.mapper.query.QueryDataScope;
import com.jeesite.common.service.CrudService; import com.jeesite.common.service.CrudService;
import com.jeesite.common.service.ServiceException; import com.jeesite.common.service.ServiceException;
import com.jeesite.common.utils.excel.ExcelImport; import com.jeesite.common.utils.excel.ExcelImport;
@@ -72,16 +73,17 @@ public class EmpUserServiceSupport extends CrudService<EmpUserDao, EmpUser>
*/ */
@Override @Override
public void addDataScopeFilter(EmpUser empUser, String ctrlPermi) { public void addDataScopeFilter(EmpUser empUser, String ctrlPermi) {
empUser.sqlMap().getDataScope().addFilter("dsfOffice", QueryDataScope dataScope = empUser.sqlMap().getDataScope();
"Office", "e.office_code", "a.create_by", ctrlPermi, "office_user"); dataScope.addFilter("dsfOffice", "Office",
"e.office_code", "a.create_by", ctrlPermi, "office_user");
if (StringUtils.isNotBlank(EmpUtils.getCompany().getCompanyCode())){ if (StringUtils.isNotBlank(EmpUtils.getCompany().getCompanyCode())){
empUser.sqlMap().getDataScope().addFilter("dsfCompany", dataScope.addFilter("dsfCompany", "Company",
"Company", "e.company_code", "a.create_by", ctrlPermi, "office_user"); "e.company_code", "a.create_by", ctrlPermi, "office_user");
} }
// empUser.sqlMap().getDataScope().addFilterByPermission("dsfOffice", "sys:empUser:view", // dataScope.addFilterByPermission("dsfOffice", "sys:empUser:view", "Office",
// "Office", "e.office_code", "a.create_by", ctrlPermi); // "e.office_code", "a.create_by", ctrlPermi);
// empUser.sqlMap().getDataScope().addFilterByPermission("dsfOffice", "sys:empUser:view", // dataScope.addFilterByPermission("dsfOffice", "sys:empUser:view", "User",
// "User", "a.user_code", ctrlPermi); // "a.user_code", ctrlPermi);
} }
/** /**