Merge remote-tracking branch 'origin/demo_' into demo_

platform-service/src/main/java/com/platform/service/preparation/impl/PreparationServiceImpl.java

@@ -882,6 +882,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
         // 发送消息
         List<SysUserVO> sendUsers = sysUserMapper.getSysUserVO(sendUserDTO);
         updPre.setNo(preparation.getNo());
+        updPre.setStatus(preparation.getStatus());
         sendMessageToApplyLeader(sendUsers, updPre);
     }
 

platform-service/src/main/java/com/platform/service/yongyou/impl/YongyouServiceImpl.java

@@ -337,8 +337,8 @@ public class YongyouServiceImpl implements YongyouService {
         }
         GetCurrentStockResponseData data = response.getData();
         List<GetCurrentStock> stocks = data.getStock();
-        if (stocks==null){
-            this.selectPageList4(record,pageNum,pageSize);
+        if (stocks == null || stocks.size() == 0){
+            return this.selectPageList4(record,pageNum,pageSize);
         }
         List<SpareStoreVO> partInfoVOS = new ArrayList<>();
         for (GetCurrentStock stockResponse : stocks) {