Sfoglia il codice sorgente

fix: 消息推送bug修复

zengweijie 2 anni fa
parent
commit
61f96528a8

+ 7 - 0
smsb-customer-manager-app/src/main/java/com/inspur/customer/service/org/SmsbDepartmentUserServiceImpl.java

@@ -193,6 +193,13 @@ public class SmsbDepartmentUserServiceImpl extends ServiceImpl<SmsbDepartmentUse
             .or(!CollectionUtils.isEmpty(org), q -> q.ne(SmsbDepartmentUserDO::getInformLevel, -1)
                 .in(SmsbDepartmentUserDO::getPath, org)
                 .eq(SmsbDepartmentUserDO::getEnabled, 1)
+                .eq(SmsbDepartmentUserDO::getTenant, tenant)
+                .between(SmsbDepartmentUserDO::getInformLevel, 0, informLevel))
+            //部门为空代表设备在根部门
+            .or(CollectionUtils.isEmpty(org), q -> q.ne(SmsbDepartmentUserDO::getInformLevel, -1)
+                .isNull(SmsbDepartmentUserDO::getPath)
+                .eq(SmsbDepartmentUserDO::getEnabled, 1)
+                .eq(SmsbDepartmentUserDO::getTenant, tenant)
                 .between(SmsbDepartmentUserDO::getInformLevel, 0, informLevel));
 
         List<SmsbDepartmentUserDO> list = this.list(queryWrapper);