From 9f40ae38d8b1e3b7d2269144c3d864ca5f15caca Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Sun, 14 Dec 2025 16:12:41 +0800
Subject: [PATCH] app养护计划明细提交

---
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java   | 3 +++
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java | 4 +++-
 urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java       | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
index 7c0421e..21d9ad3 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
@@ -380,6 +380,9 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         Long deptId = SecurityFrameworkUtils.getDeptId();
         /*1.查询登录用户角色*/
         List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        if (CollectionUtils.isEmpty(roleIds)) {
+            return Collections.emptySet();
+        }
         QueryWrapper<InspectionPlanRoleDO> roleSql = new QueryWrapper<>();
         roleSql.select("batch_no");
         roleSql.lambda().in(InspectionPlanRoleDO::getRoleId, roleIds).
diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java
index bf9fa45..16daa79 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java
@@ -132,8 +132,10 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
         Long deptId = SecurityFrameworkUtils.getDeptId();
         /*1.查询登录用户角色*/
         List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        if (CollectionUtils.isEmpty(roleIds)) {
+            return Collections.emptySet();
+        }
         QueryWrapper<MaintainPlanRoleDO> roleSql = new QueryWrapper<>();
-        roleSql.select("batch_no");
         roleSql.lambda().in(MaintainPlanRoleDO::getRoleId, roleIds).
                 eq(MaintainPlanRoleDO::getCompanyId, companyId)
                 .eq(MaintainPlanRoleDO::getDeptId, deptId);
diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
index 6d69136..b9d31f7 100644
--- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
+++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanServiceImpl.java
@@ -364,6 +364,9 @@ public class MaintainPlanServiceImpl implements MaintainPlanService {
         Long deptId = SecurityFrameworkUtils.getDeptId();
         /*1.查询登录用户角色*/
         List<Long> roleIds = roleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        if (CollectionUtils.isEmpty(roleIds)) {
+            return Collections.emptySet();
+        }
         QueryWrapper<MaintainPlanRoleDO> roleSql = new QueryWrapper<>();
         roleSql.select("batch_no");
         roleSql.lambda().in(MaintainPlanRoleDO::getRoleId, roleIds).
--
libgit2 0.21.4