From bec1e27df1cce02f0a4b9aa19a2fc50f4551fb64 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期日, 27 四月 2025 15:00:28 +0800
Subject: [PATCH] 【UPDATE】1.新增或修改日历数据时验证有效日期和失效日期是否重叠 2.增加日历视图页面接口
---
aps-common/aps-common-datascope/src/main/java/com/aps/common/datascope/aspect/DataScopeAspect.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/aps-common/aps-common-datascope/src/main/java/com/aps/common/datascope/aspect/DataScopeAspect.java b/aps-common/aps-common-datascope/src/main/java/com/aps/common/datascope/aspect/DataScopeAspect.java
index b449065..eddb270 100644
--- a/aps-common/aps-common-datascope/src/main/java/com/aps/common/datascope/aspect/DataScopeAspect.java
+++ b/aps-common/aps-common-datascope/src/main/java/com/aps/common/datascope/aspect/DataScopeAspect.java
@@ -122,11 +122,15 @@
if (scopeCustomIds.size() > 1)
{
// 澶氫釜鑷畾鏁版嵁鏉冮檺浣跨敤in鏌ヨ锛岄伩鍏嶅娆℃嫾鎺ャ��
- sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
+ //sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
+ sqlString.append(StringUtils.format(" OR {}.plant IN ( SELECT dept_org_code FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
+
}
else
{
- sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
+ //sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
+ sqlString.append(StringUtils.format(" OR {}.plant IN ( SELECT dept_org_code FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
+
}
}
else if (DATA_SCOPE_DEPT.equals(dataScope))
--
Gitblit v1.9.3