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

5.13.0

Browse Source
This commit is contained in:
thinkgem
2025-08-18 11:34:10 +08:00
parent 65aa023c92
commit 6b75fe67af
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/app/src/main/resources/db/upgrade/app/versions
View File

@@ -28,4 +28,5 @@
5.11.0
5.11.1
5.12.0
5.12.1
5.12.1
5.13.0

3
modules/cms/src/main/resources/db/upgrade/cms/versions
View File

@@ -36,4 +36,5 @@
5.11.0
5.11.1
5.12.0
5.12.1
5.12.1
5.13.0

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