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

commons/src/main/java/com/jzg/commons/entity/orders/po/InsFeeOrderRecord.java

@@ -18,11 +18,12 @@ import lombok.NoArgsConstructor;
 @Schema(description = "订单费用调整记录表")
 @NoArgsConstructor
 public class InsFeeOrderRecord extends BaseModel {
-    @TableId(value = "id", type = IdType.AUTO)
-    @Schema(description = "主键")
-    private Long id;
+//    @TableId(value = "id", type = IdType.AUTO)
+//    @Schema(description = "主键")
+//    private Long id;
 
-    @Schema(description = "订单号")
+    @TableId(value = "order_no", type = IdType.INPUT)
+    @Schema(description = "订单号（主键）")
     private String orderNo;
 
     @Schema(description = "交强入口比例")

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

@@ -621,6 +621,9 @@ public class InsFeeAuditServiceImpl extends ServiceImpl<InsFeeAuditMapper, InsFe
 
         // 获取订单关联协议的相关比例
         InsFeeOrders feeOrders = feeOrdersService.getById(orderNo);
+        if (null == feeOrders){
+            return CollUtil.newArrayList();
+        }
         List<PtlAgreementCostTypeVo> costTypeVos = orgClient.queryByCostId(feeOrders.getCostId());
         List<AuditCostInfoVo> auditCostInfoVos = new ArrayList<>();
         if(CollUtil.isNotEmpty(records)){

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -965,6 +965,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             }else{
                 originSysUser.setIdentityTimeEnd(LocalDate.parse(sysUserVo.getIdentityTimeEnd(), DateTimeFormatter.ISO_DATE));
             }
+            if (StrUtil.isNotBlank(sysUserVo.getMobile())) {
+                originSysUser.setMobile(sysUserVo.getMobile());
+            }
             sysUserService.updateById(originSysUser);
         }
         sysUserJzgInfoService.updateById(sysUserJzgInfo);

tenant/organization/src/main/resources/mapper/ReceivableMapper.xml

@@ -208,7 +208,7 @@
             io.product_name,
             CASE io.entry_status
             WHEN 1 THEN '车险出单'
-            WHEN 2 THEN '待客录单'
+            WHEN 2 THEN '代客录单'
             WHEN 3 THEN '补录订单'
             ELSE '未知状态'
             END AS order_type,