Merge remote-tracking branch 'origin/master'

rain

2026-02-09 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdOperationalRevenueServiceImpl.java

@@ -14,6 +14,7 @@
import org.sxkj.system.cache.SysCache;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.List;

/**
@@ -78,8 +79,10 @@
         queryWrapper.like(GdOperationalRevenue::getNickName, nickName);
      }
      // 创建部门
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      queryWrapper.in(GdOperationalRevenue::getCreateDept, deptList);
       if (!AuthUtil.isAdministrator()) {
         List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
         queryWrapper.in(GdOperationalRevenue::getCreateDept, deptList);
      }
      // 按创建时间倒序
      queryWrapper.orderByDesc(GdOperationalRevenue::getCreateTime);