diff --git a/aucma-base/src/main/resources/mapper/base/OrderBomInfoMapper.xml b/aucma-base/src/main/resources/mapper/base/OrderBomInfoMapper.xml index 430ca6f..ac3ce47 100644 --- a/aucma-base/src/main/resources/mapper/base/OrderBomInfoMapper.xml +++ b/aucma-base/src/main/resources/mapper/base/OrderBomInfoMapper.xml @@ -169,7 +169,7 @@ @@ -199,4 +199,4 @@ #{item.materialCode} - \ No newline at end of file + diff --git a/aucma-framework/src/main/java/com/aucma/framework/aspectj/DataScopeAspect.java b/aucma-framework/src/main/java/com/aucma/framework/aspectj/DataScopeAspect.java index c024ae7..e6c6ec6 100644 --- a/aucma-framework/src/main/java/com/aucma/framework/aspectj/DataScopeAspect.java +++ b/aucma-framework/src/main/java/com/aucma/framework/aspectj/DataScopeAspect.java @@ -124,7 +124,7 @@ public class DataScopeAspect else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope)) { sqlString.append(StringUtils.format( - " OR {}.dept_id IN ( SELECT dept_id from Z_sys_dept WHERE dept_id = {} or 0 < find_in_set( {} , ancestors ) )", + " OR {}.dept_id IN ( SELECT dept_id from Z_sys_dept WHERE dept_id = {} or INSTR(',' || ancestors || ',', ',' || {} || ',') > 0 )", deptAlias, user.getDeptId(), user.getDeptId())); } else if (DATA_SCOPE_SELF.equals(dataScope)) diff --git a/aucma-production/src/main/resources/mapper/production/BaseBomInfoMapper.xml b/aucma-production/src/main/resources/mapper/production/BaseBomInfoMapper.xml index 8ec4444..6512458 100644 --- a/aucma-production/src/main/resources/mapper/production/BaseBomInfoMapper.xml +++ b/aucma-production/src/main/resources/mapper/production/BaseBomInfoMapper.xml @@ -101,7 +101,7 @@ @@ -190,4 +190,4 @@ #{objId} - \ No newline at end of file + diff --git a/aucma-system/src/main/resources/mapper/system/SysDeptMapper.xml b/aucma-system/src/main/resources/mapper/system/SysDeptMapper.xml index eace0fb..abf4c3a 100644 --- a/aucma-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/aucma-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -73,11 +73,11 @@