Prechádzať zdrojové kódy

feat: update something

shc 1 rok pred
rodič
commit
814880c172

+ 4 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/SysImplementPlanManager.java

@@ -240,8 +240,8 @@ public class SysImplementPlanManager {
                                            LocalDate[] period) {
 
         LambdaQueryWrapper<SysImplementPlan> wrapper = Wrappers.<SysImplementPlan>lambdaQuery()
-                .eq(Objects.nonNull(consigneeId), SysImplementPlan::getConsigneeId, consigneeId)
-                .eq(Objects.nonNull(consignorId), SysImplementPlan::getConsignorId, consignorId)
+//                .eq(Objects.nonNull(consigneeId), SysImplementPlan::getConsigneeId, consigneeId)
+//                .eq(Objects.nonNull(consignorId), SysImplementPlan::getConsignorId, consignorId)
                 .like(StrUtil.isNotBlank(planName), SysImplementPlan::getPlanName, planName);
 
         // 服务商管理员(只查询发给我的)
@@ -251,6 +251,8 @@ public class SysImplementPlanManager {
         }
         // 区域 (查询发给我的和我下发的)
         else if (entLevel == 1) {
+            // 查询发给我的
+            wrapper.eq(Objects.nonNull(consignorId), SysImplementPlan::getConsigneeId, consignorId);
             wrapper.eq(SysImplementPlan::getPlanState, UpmsState.ImplementPlanState.PASSED)
                     .and(wrp -> wrp.eq(SysImplementPlan::getConsigneeId, user.getDeptId()).or().eq(SysImplementPlan::getConsignorId, user.getDeptId()));
         }