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

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -163,12 +163,12 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     public HttpResult saveOrders(InsOrdersAdd ordersAdd) {
         // 检查输入参数是否为空，如果为空则返回错误信息
         try {
-
             // 获取订单对象并设置引用编号
             InsOrders insOrders = ordersAdd.getInsOrders();
-            insOrders.setRealQuoteUserId(baseController.getUserName());
+            String realQuoteUserId = insOrders.getRealQuoteUserId();
+            insOrders.setRealQuoteUserId(StrUtil.isNotBlank(realQuoteUserId) ? realQuoteUserId : baseController.getUserName());
             InsOrdersAdd insOrdersAdd = BeanCopyUtil.deepCopy(ordersAdd, InsOrdersAdd.class);
-            InsOrders parentOrders = insOrdersMapper.selectMainOrderNumber(ordersAdd.getCarInfoVo().getLicenseNo(),ordersAdd.getInsOrders().getRealQuoteUserId());
+            InsOrders parentOrders = insOrdersMapper.selectMainOrderNumber(ordersAdd.getCarInfoVo().getLicenseNo(), realQuoteUserId);
             boolean nullOrders = ObjectUtil.isNull(parentOrders);
             if (nullOrders){
                 insOrders.setQuoteNo(SnowFlakeUtil.getSnowFlakeId());