From faf55275dcb8d413f18642b3410c8e7df9f6cd9c Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Thu, 29 Jan 2026 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java
index 0456914..3aea404 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java
@@ -5,13 +5,16 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
- import org.springframework.stereotype.Service;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springframework.stereotype.Service;
import org.sxkj.gd.workorder.entity.GdOperationalRevenue;
import org.sxkj.gd.workorder.mapper.GdOperationalRevenueMapper;
import org.sxkj.gd.workorder.service.GdOperationalRevenueService;
import org.sxkj.gd.workorder.vo.GdOperationalRevenueVo;
+import org.sxkj.system.cache.SysCache;
import java.math.BigDecimal;
+import java.util.List;
/**
* 运营收益Service实现类
@@ -69,8 +72,9 @@
if (StringUtils.hasText(nickName)) {
queryWrapper.like(GdOperationalRevenue::getNickName, nickName);
}
-
-
+ // 创建部门
+ List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
+ queryWrapper.in(GdOperationalRevenue::getCreateDept, deptList);
// 按创建时间倒序
queryWrapper.orderByDesc(GdOperationalRevenue::getCreateTime);
--
Gitblit v1.9.3