From 3f957d3cf5d05109867800a2d78ee0bb9ecb4561 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 17 Jan 2026 16:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdInspectionGroupServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdInspectionGroupServiceImpl.java b/ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdInspectionGroupServiceImpl.java
index bc2002b..bd73c0c 100644
--- a/ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdInspectionGroupServiceImpl.java
+++ b/ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdInspectionGroupServiceImpl.java
@@ -46,7 +46,6 @@
* @return 精细化巡检分组
*/
@Override
- @DataScope(deptAlias = "d")
public List<ArdInspectionGroup> selectArdInspectionGroupList(ArdInspectionGroup ardInspectionGroup) {
return ardInspectionGroupMapper.selectArdInspectionGroupList(ardInspectionGroup);
}
@@ -59,6 +58,8 @@
*/
@Override
public int insertArdInspectionGroup(ArdInspectionGroup ardInspectionGroup) {
+ ArdInspectionGroup inspectionGroup = ardInspectionGroupMapper.selectArdInspectionGroupByGroupId(ardInspectionGroup.getGroupParentId());
+ ardInspectionGroup.setAncestors(inspectionGroup.getAncestors() + "," + ardInspectionGroup.getGroupParentId());
ardInspectionGroup.setCreateTime(DateUtils.getNowDate());
return ardInspectionGroupMapper.insertArdInspectionGroup(ardInspectionGroup);
}
@@ -71,7 +72,6 @@
*/
@Override
public int updateArdInspectionGroup(ArdInspectionGroup ardInspectionGroup) {
-
ArdInspectionGroup newGroup = ardInspectionGroupMapper.selectArdInspectionGroupByGroupId(ardInspectionGroup.getGroupParentId());
ArdInspectionGroup oldGroup = ardInspectionGroupMapper.selectArdInspectionGroupByGroupId(ardInspectionGroup.getGroupId());
if(StringUtils.isNotNull(newGroup) && StringUtils.isNotNull(oldGroup)){
--
Gitblit v1.9.3