From 6416b165e4a3c8ecc2d547ceef0fb3962d3c7b56 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期一, 12 一月 2026 14:58:45 +0800
Subject: [PATCH] 1.查询产品信息列表接口，销售台账查询其产品的状态 2.增添不合格现象字段，取消生产状态字段 3.修改发货审批接口,发货审批通过，生产该订单出库记录 4.存在质检记录并已提交的销售台账删除时做出限制 5.生产报工投入，产出2:1调整
---
src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
index a15b110..2cf52c3 100644
--- a/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
+++ b/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
@@ -117,18 +117,18 @@
conditions.add(dataScope);
break;
}
- else if (DATA_SCOPE_CUSTOM.equals(dataScope))
- {
- 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)));
- }
- else
- {
- sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
- }
- }
+// else if (DATA_SCOPE_CUSTOM.equals(dataScope))
+// {
+// 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)));
+// }
+// else
+// {
+// sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
+// }
+// }
// else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
// {
// sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
--
Gitblit v1.9.3