Merge branch 'dev' into pre-production

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");

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
+        SELECT * FROM sup_indicators WHERE is_deleted = 0 and create_user = #{params.userId}
-        <if test="param.assessDept != null and param.assessDept != ''" >
+        <if test="params.assessDept != null and params.assessDept != ''" >
-            and assess_dept = #{param.assessDept}
+            and assess_dept = #{params.assessDept}
         </if>
-        <if test="param.startTime != null and param.startTime != ''" >
+        <if test="params.startTime != null and params.startTime != ''" >
-            and date_format(create_time,'%y%m%d%') >= date_format(#{param.startTime},'%y%m%d%')
+            and date_format(create_time,'%y%m%d%') >= date_format(#{params.startTime},'%y%m%d%')
         </if>
-        <if test="param.endTime != null and param.endTime != ''" >
+        <if test="params.endTime != null and params.endTime != ''" >
-            and date_format(create_time,'%y%m%d%') &lt;= date_format(#{param.endTime},'%y%m%d%')
+            and date_format(create_time,'%y%m%d%') &lt;= date_format(#{params.endTime},'%y%m%d%')
         </if>
     </select>