From 8f7e6120036bc0e02a30e3bbd044830f6f7a648b Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 25 Jan 2024 17:18:31 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=80=83=E6=A0=B8=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8FBUg=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/supervise/mapper/IndicatorsMapper.xml    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
index 4e9a28282..4b27d6851 100644
--- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
+++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml
@@ -45,15 +45,15 @@
           and si.id = #{id}
     </select>
     <select id="selectMyApiIndicators" resultType="com.logpm.supervise.vo.IndicatorsVO">
-        SELECT * FROM sup_indicators WHERE is_deleted = 0 and
-        <if test="param.assessDept != null and param.assessDept != ''" >
-            and assess_dept = #{param.assessDept}
+        SELECT * FROM sup_indicators WHERE is_deleted = 0 and create_user = #{params.userId}
+        <if test="params.assessDept != null and params.assessDept != ''" >
+            and assess_dept = #{params.assessDept}
         </if>
-        <if test="param.startTime != null and param.startTime != ''" >
-            and date_format(create_time,'%y%m%d%') >= date_format(#{param.startTime},'%y%m%d%')
+        <if test="params.startTime != null and params.startTime != ''" >
+            and date_format(create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
         </if>
-        <if test="param.endTime != null and param.endTime != ''" >
-            and date_format(create_time,'%y%m%d%') &lt;= date_format(#{param.endTime},'%y%m%d%')
+        <if test="params.endTime != null and params.endTime != ''" >
+            and date_format(create_time,'%y%m%d%') &lt;= date_format(#{params.endTime},'%y%m%d%')
         </if>
     </select>
 

From b1f4a6c1068881d68c45cb618a36e7d0ba37d47d Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 25 Jan 2024 17:30:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A7=E7=89=A9?=
 =?UTF-8?q?=E7=9A=84null=20=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appcontroller/DistributionStockupAppController.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
index d2d29b39e..0a5691c4b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java
@@ -1571,7 +1571,9 @@ public class DistributionStockupAppController extends BladeController {
 					warehouseUpdownGoodsEntity.setAssociationValue(stockupDTO.getPacketBarCode());
 					warehouseUpdownGoodsEntity.setWarehouseId(distributionStockupEntity.getWarehouseId());
 					WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationInformation(warehouseUpdownGoodsEntity);
-					entity.setAllocationTitle(locationInformation.getPositionCode());
+					if(ObjectUtils.isNotNull(locationInformation)){
+						entity.setAllocationTitle(locationInformation.getPositionCode());
+					}
 					entity.setAllocationId(stockupDTO.getAllocationId());
 				}
 				entity.setConditions("0");