From 6fdfe4b64957044b0916c8ad09ba88ff0c5d8241 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Wed, 15 Nov 2023 11:24:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E8=AE=B0=E5=BD=95=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operational/defect/service/impl/DefectCheckServiceImpl.java     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
index a5552e5..70fc27f 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/service/impl/DefectCheckServiceImpl.java
@@ -79,7 +79,7 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper
     private final IUserClient userClient;
     @Autowired
     private RedisTemplate redisTemplate;
-    private IStationClient stationClient;
+    private final IStationClient stationClient;
     private final IFlowClient processClient;
 
     private final IMessageClient messageClient;
@@ -150,14 +150,14 @@ public class DefectCheckServiceImpl extends BaseServiceImpl<OperPhenomenonMapper
         LocalDateTime firstDay = date.with(TemporalAdjusters.firstDayOfMonth()).withHour(0).withMinute(0).withSecond(0);
         LocalDateTime lastDay = date.with(TemporalAdjusters.lastDayOfMonth()).withHour(23).withMinute(59).withSecond(59);
         List<OperPhenomenonEntity> ticketList = this.list(
-                Wrappers.<OperPhenomenonEntity>lambdaQuery().eq(OperPhenomenonEntity::getCreateDept, entity.getCreateDept())
+                Wrappers.<OperPhenomenonEntity>lambdaQuery().eq(OperPhenomenonEntity::getCreateDept, deptId)
                         .ge(OperPhenomenonEntity::getCreateTime, firstDay).le(OperPhenomenonEntity::getCreateTime, lastDay)
         );
         String suffix = String.format(String.format("%03d", ticketList.size() + 1));
         String result = stationR.getData().getSignage() + yearMonth + suffix;
 
         // 缺陷编码 : 按项目+年+月+序号
-        if (Func.isEmpty(result)) {
+        if (Func.isNotEmpty(result)) {
             entity.setDefectCode(result);
         }
         // 现象发起人 : 当前用户Id