From 6b75fe67af5f78416a423b1ed0b51155db7dcc8e Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 18 Aug 2025 11:34:10 +0800
Subject: [PATCH] 5.13.0

---
 README.md                                      |  2 +-
 .../src/main/resources/db/upgrade/app/versions |  3 ++-
 .../src/main/resources/db/upgrade/cms/versions |  3 ++-
 .../service/support/EmpUserServiceSupport.java | 18 ++++++++++--------
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 1f9610de..53d06ad3 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 </p>
 <h3 align="center" style="margin:30px 0 30px;font-weight:bold;font-size:30px;">快速开发平台 - Spring Boot 3</h3>
 <p align="center">
- <a href="https://spring.io/projects/spring-boot" target="__blank"><img alt="SpringBoot-V2.7/3.4" src="https://img.shields.io/badge/SpringBoot-V2.7/3.4-blue.svg"></a>
+ <a href="https://spring.io/projects/spring-boot" target="__blank"><img alt="SpringBoot-V3.5 or 2.7" src="https://img.shields.io/badge/SpringBoot-V3.5 or 2.7-blue.svg"></a>
  <a href="https://v3.cn.vuejs.org/" target="__blank"><img alt="TypeScript-Vue3" src="https://img.shields.io/badge/TypeScript-Vue3-green.svg"></a>
  <a href="https://jeesite.com/docs/upgrade/" target="__blank"><img alt="JeeSite-V5.x" src="https://img.shields.io/badge/JeeSite-V5.x-success.svg"></a>
  <a href="https://gitee.com/thinkgem/jeesite5" target="__blank"><img alt="star" src="https://gitee.com/thinkgem/jeesite5/badge/star.svg?theme=dark"></a>
diff --git a/modules/app/src/main/resources/db/upgrade/app/versions b/modules/app/src/main/resources/db/upgrade/app/versions
index 00e5430b..5ede06dd 100644
--- a/modules/app/src/main/resources/db/upgrade/app/versions
+++ b/modules/app/src/main/resources/db/upgrade/app/versions
@@ -28,4 +28,5 @@
 5.11.0
 5.11.1
 5.12.0
-5.12.1
\ No newline at end of file
+5.12.1
+5.13.0
\ No newline at end of file
diff --git a/modules/cms/src/main/resources/db/upgrade/cms/versions b/modules/cms/src/main/resources/db/upgrade/cms/versions
index e24a7341..18987ef8 100644
--- a/modules/cms/src/main/resources/db/upgrade/cms/versions
+++ b/modules/cms/src/main/resources/db/upgrade/cms/versions
@@ -36,4 +36,5 @@
 5.11.0
 5.11.1
 5.12.0
-5.12.1
\ No newline at end of file
+5.12.1
+5.13.0
\ No newline at end of file
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 eb3ee1ac..d8611dc6 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
@@ -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);
 	}
 
 	/**