Merge remote-tracking branch 'origin/dev_jzg_lipf_v20260518'

commons/src/main/java/com/jzg/commons/core/page/HttpResult.java

@@ -2,6 +2,7 @@ package com.jzg.commons.core.page;
 
 
 
+import java.io.Serial;
 import java.io.Serializable;
 
 /**
@@ -10,6 +11,8 @@ import java.io.Serializable;
 
 public class HttpResult<T> implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = 6110438502593696250L;
     private int code = 200;
 
     private String msg;

commons/src/main/java/com/jzg/commons/entity/agreement/dispatch/dto/PtlAgreementDispatch.java

@@ -8,7 +8,7 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
+import java.io.Serial;
 
 @Data
 @NoArgsConstructor
@@ -16,6 +16,8 @@ import java.io.Serializable;
 @Schema(description = "协议调度实体")
 public class PtlAgreementDispatch extends BaseModel {
 
+    @Serial
+    private static final long serialVersionUID = 1408696065054280481L;
     @Schema(description = "id")
     private String id;
 

commons/src/main/java/com/jzg/commons/entity/agreement/dispatch/dto/PtlAgreementDispatchRulesAttrLink.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -12,6 +13,7 @@ import java.util.List;
 @Schema(description = "协议调度规则属性关联实体")
 public class PtlAgreementDispatchRulesAttrLink implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1000183859846970741L;
 
     @Schema(description = "id")

commons/src/main/java/com/jzg/commons/entity/dto/SysUserJzgInfoBankCardDto.java

@@ -82,6 +82,9 @@ public class SysUserJzgInfoBankCardDto implements Serializable {
     @Schema(description = "审核人")
     private String auditBy;
 
+    @Schema(description = "管理员名称")
+    private String leaderName;
+
     @Schema(description = "审核记录列表")
     private List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList;
 }

commons/src/main/java/com/jzg/commons/entity/vo/SysUserAccountVo.java

@@ -39,4 +39,7 @@ public class SysUserAccountVo extends BaseModel {
 
     @Schema(description = "未付总金额")
     private BigDecimal sumAmountUnpaid;
+
+    @Schema(description = "管理员名称")
+    private String leaderName;
 }

tenant/costsorrule/src/main/java/com/jzg/costsorrule/controller/RuleController.java

@@ -1,12 +1,11 @@
 package com.jzg.costsorrule.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchRulesAttrLink;
-import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchVo;
 import com.jzg.commons.entity.agreement.dispatch.vo.ValidateDispatchRuleVo;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import com.jzg.commons.entity.scheme.po.PtlSchemeRulesAttrLink;
@@ -15,6 +14,8 @@ import com.jzg.costsorrule.model.RuleAttrLinkVo;
 import com.jzg.commons.entity.costs.vo.ValidateSchemeRuleVo;
 import com.jzg.costsorrule.service.RuleService;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -37,6 +38,8 @@ import java.util.stream.Collectors;
 @RequestMapping("/validate/rule")
 public class RuleController extends BaseController {
 
+    private static final Logger log = LoggerFactory.getLogger(RuleController.class);
+
     @Autowired
     private RuleService ruleService;
 
@@ -81,6 +84,7 @@ public class RuleController extends BaseController {
      */
     @PostMapping(value = "/validateDispatchRule")
     public HttpResult validateSchemeRule(@RequestBody ValidateDispatchRuleVo validateDispatchRuleVo){
+        log.info("校验调度规则：校验调度规则=[{}]", JSONUtil.toJsonStr(validateDispatchRuleVo));
         Map<String, List<PtlAgreementDispatchRulesAttrLink>> maps = new HashMap<>();
         for (ValidateDispatchRuleVo.DispatchAttrVo dispatchAttrVo : validateDispatchRuleVo.getDispatchAttrVos()){
             for (ValidateDispatchRuleVo.Section section : dispatchAttrVo.getSections()) {

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/UnifyOrderManager.java

@@ -244,7 +244,7 @@ public class UnifyOrderManager {
         String systemCode = getSystemCode();
         String companyName = CompanyConstants.getCompanyNameByCode(esmInsCompanyHttpResult.getData().getCompanyCode());
 
-
+        log.info("查询保司配置的协议：systemCode=[{}],companyId=[{}]",systemCode, esmInsCompanyHttpResult.getData().getId());
         HttpResult<List<PtlAgreement>> byCompanyId = orgClient.getByCompanyId(esmInsCompanyHttpResult.getData().getId(), systemCode);
         if (CollUtil.isEmpty(byCompanyId.getData())) {
             AssertionUtils.isFail(true, "保司未配置协议");
@@ -699,7 +699,7 @@ public class UnifyOrderManager {
     @Operation(summary = "获取订单状态")
     @PostMapping("/getOrderStatus")
     public HttpResult getOrderStatus(@RequestBody OrderStatusVo orderStatusVo) throws Exception {
-
+        log.info("更新订单状态：orderStatusVo=[{}]",JSONUtil.toJsonStr(orderStatusVo));
         InsOrders insOrders = insOrdersService.getById(orderStatusVo.getOrder().getOrdersNo());
         AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
         HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId());
@@ -721,7 +721,7 @@ public class UnifyOrderManager {
         InsOrdersAccidentalDriving insOrdersAccidentalDriving = insOrdersAccidentalDrivingService.getByOrderId(insOrders.getId());
         orderStatusVo.setInsOrdersAccidentalDriving(insOrdersAccidentalDriving);
         OrderStatusResultVo orderStatusResultVo = orderStatusService.queryOrderState(orderStatusVo);
-
+        log.info("订单状态orderStatusResultVo=[{}]",JSONUtil.toJsonStr(orderStatusResultVo));
         // 保存状态查询结果
         insOrdersService.orderAfterUpdateOrderStatus(orderStatusVo.getOrder().getOrdersNo(), orderStatusResultVo);
         // 保存支付链接
@@ -729,22 +729,89 @@ public class UnifyOrderManager {
         insOrdersQrcodeService.saveQrCode(insOrders);
         //////////////////////////////////////////新增营销抽奖活动////////////////////////////////////////////////
         // 承保(客户)、出单(业务员)
-        if (orderStatusResultVo.getOrderStatus() == InsOrderStatusEnum.UNDERWRITED) {
-            // 远程调用活动列表
-            // 匹配规则
-            // 规则一：累计出单()次，可得()次抽奖机会
-            // 规则二：累计出单()次，可得()次抽奖机会
-            // 下一个规则的出单次数不能不上一个规则出单次数小
-            HttpResult<List<LotteryActivityVO>> result = localLivingClient.queryActivityRules(lotteryScene);
-            if (result == null || result.getCode() != 200 || result.getData() == null) {
-                log.error("活动列表异常");
-            } else {
-                for (LotteryActivityVO activity : result.getData()) {
-                    // 检查活动是否有效
-                    if (!LocalDate.now().isBefore(activity.getActivityStartTime())
-                            && !LocalDate.now().isAfter(activity.getActivityEndTime())) {
-                        continue;
-                    }
+        if(orderStatusResultVo.getOrderStatus() == InsOrderStatusEnum.UNDERWRITED){
+            doSomethingAfterUnderwited(insOrders);
+        }
+        return HttpResult.ok("状态刷新成功");
+    }
+
+    /**
+     * 模拟承保(跳过实际付款操作)
+     *
+     * @author lipf
+     * @date 2026/5/19 12:00
+     */
+    @Operation(summary = "模拟承保(跳过实际付款操作)")
+    @PostMapping("/mockUnderwited")
+    public HttpResult<String> mockUnderwited(@RequestBody OrderStatusVo orderStatusVo) throws Exception {
+        log.info("模拟承保(跳过实际付款操作). orderStatusVo=[{}]", JSONUtil.toJsonStr(orderStatusVo));
+        InsOrders insOrders = insOrdersService.getById(orderStatusVo.getOrder().getOrdersNo());
+        if(!"4".equals(insOrders.getOrderStatus())){
+            return HttpResult.error("只能对待缴费的订单进行模拟承保");
+        }
+        AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
+        HttpResult<EsmInsCompany> esmInsCompanyHttpResult = platformClient.findById(insOrders.getCompanyId());
+        orderStatusVo.getOrder().setAgreementId(insOrders.getAgreementId());
+        orderStatusVo.getOrder().setInsuranceCompanyCode(esmInsCompanyHttpResult.getData().getCompanyCode());
+        orderStatusVo.getOrder().setInsuranceCompanyId(esmInsCompanyHttpResult.getData().getId());
+        orderStatusVo.getOrder().setCompanyOrderNo(insOrders.getCompanyOrderNo());
+        orderStatusVo.getOrder().setApiType(Integer.parseInt(insOrders.getApiType()));
+        orderStatusVo.setInsOrders(insOrders);
+        //获取保司实体
+        QuotationBaseService orderStatusService = companyFactory.getOrderStatusService(orderStatusVo);
+        orderStatusVo.setCarInfo(insOrdersCarInfoService.getByOrderId(insOrders.getId()));
+        InsOrdersPolicy insOrdersPolicy = insOrdersPolicyService.getById(insOrders.getId());
+        orderStatusVo.setInsOrdersPolicy(insOrdersPolicy);
+        List<InsOrdersCarUserInfo> insOrdersCarUserInfos = insOrdersCarUserInfoService.getByOrderId(insOrders.getId());
+        orderStatusVo.setInsOrdersCarUserInfoList(insOrdersCarUserInfos);
+        InsOrdersCosts insOrdersCosts = insOrdersCostsService.getById(insOrders.getId());
+        orderStatusVo.setInsOrdersCosts(insOrdersCosts);
+        InsOrdersAccidentalDriving insOrdersAccidentalDriving = insOrdersAccidentalDrivingService.getByOrderId(insOrders.getId());
+        orderStatusVo.setInsOrdersAccidentalDriving(insOrdersAccidentalDriving);
+        //OrderStatusResultVo orderStatusResultVo = orderStatusService.queryOrderState(orderStatusVo);
+        //log.info("模拟承保订单状态状态查询orderStatusResultVo=[{}]",JSONUtil.toJsonStr(orderStatusResultVo));
+        // 模拟接口请求成功
+        OrderStatusResultVo orderStatusResultVo = new OrderStatusResultVo();
+        orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.UNDERWRITED);
+        // 保存状态查询结果
+        try{
+            // 设置订单状态为 已承保(5)
+            InsOrders insOrdersItem = new  InsOrders();
+            insOrdersItem.setOrderStatus("5");
+            insOrdersItem.setAuditStatus(1);
+            insOrdersItem.setId(insOrders.getId());
+            insOrdersService.updateById(insOrdersItem);
+            insOrdersService.orderAfterUpdateOrderStatus(orderStatusVo.getOrder().getOrdersNo(), orderStatusResultVo);
+        }catch (Exception e){
+            log.error("承保后，更新状态，进行后续逻辑异常. orderStatusResultVo=[{}]",JSONUtil.toJsonStr(orderStatusResultVo), e);
+        }
+
+        //this.doSomethingAfterUnderwited(insOrders);
+        return HttpResult.ok("模拟承保(跳过实际付款操作)");
+    }
+
+    /**
+     * 订单承保后执行一些操作
+     *
+     * @author lipf
+     * @date 2026/5/19 11:59
+     */
+    private void doSomethingAfterUnderwited(InsOrders insOrders) {
+        // 远程调用活动列表
+        // 匹配规则
+        // 规则一：累计出单()次，可得()次抽奖机会
+        // 规则二：累计出单()次，可得()次抽奖机会
+        // 下一个规则的出单次数不能不上一个规则出单次数小
+        HttpResult<List<LotteryActivityVO>> result = localLivingClient.queryActivityRules(lotteryScene);
+        if (result == null || result.getCode() != 200 || result.getData() == null) {
+            log.error("活动列表异常");
+        } else {
+            for (LotteryActivityVO activity : result.getData()) {
+                // 检查活动是否有效
+                if (!LocalDate.now().isBefore(activity.getActivityStartTime())
+                        && !LocalDate.now().isAfter(activity.getActivityEndTime())) {
+                    continue;
+                }
 
                     if (activity.getLocalActivityTables() == null) {
                         continue;
@@ -844,7 +911,7 @@ public class UnifyOrderManager {
     )
     @Operation(summary = "获取保单")
     @PostMapping("/downloadPolicy")
-    public HttpResult downloadPolicy(@RequestBody DownloadPolicyVo downloadPolicyVo) {
+    public HttpResult downloadPolicy(@RequestBody DownloadPolicyVo downloadPolicyVo) throws IOException {
         //获取保司实体
         InsOrders insOrders = insOrdersService.getById(downloadPolicyVo.getOrder().getOrdersNo());
         InsOrdersCarInfo carInfo = insOrdersCarInfoService.getByOrderId(insOrders.getId());
@@ -908,7 +975,7 @@ public class UnifyOrderManager {
         return HttpResult.ok(insOrdersPdfUrl);
     }
 
-    @PostMapping("test")
+    @PostMapping("login")
     @Operation(summary = "登录")
     public HttpResult login(@RequestBody LoginBase loginBase) {
         zhongMeiCrawlerRequest.login(loginBase);

tenant/organization/src/main/java/com/jzg/organization/controller/SchemeController.java

@@ -82,7 +82,7 @@ public class SchemeController {
 
     @Operation(summary = "规则过滤保险公司")
     @PostMapping("/ruleFilterCompany")
-    public HttpResult ruleFilterCompany(@RequestBody SchemeRuleFilterVo schemeRuleFilterVo){
+    public HttpResult<List<PtlAgreementInsCompanyVo>> ruleFilterCompany(@RequestBody SchemeRuleFilterVo schemeRuleFilterVo){
         List<PtlAgreementInsCompanyVo> ptlAgreementInsCompanyVos = ptlSchemeService.ruleFilterCompany(schemeRuleFilterVo);
         return HttpResult.ok(ptlAgreementInsCompanyVos);
     }

tenant/organization/src/main/java/com/jzg/organization/service/PtlAgreementDispatchService.java

@@ -1,22 +1,12 @@
 package com.jzg.organization.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatch;
-import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchAction;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchAfterAction;
 import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchQuery;
 import com.jzg.commons.entity.agreement.dispatch.vo.PtlAgreementDispatchVo;
-import com.jzg.commons.entity.dto.*;
-import com.jzg.commons.entity.po.PtlAgreement;
-import com.jzg.commons.entity.po.PtlAgreementCost;
-import com.jzg.commons.entity.vo.AgreementInfoVo;
-import com.jzg.commons.entity.vo.AgreementUserVo;
-import com.jzg.commons.entity.vo.AgreementVo;
-import com.jzg.commons.entity.vo.UpAndDownVo;
 
 import java.util.List;
-import java.util.Map;
 
 /**
 * 协议调度service层

tenant/organization/src/main/java/com/jzg/organization/service/PtlSchemeService.java

@@ -68,8 +68,9 @@ public interface PtlSchemeService extends IService<PtlScheme> {
 
     /**
      * 规则过滤保险公司
-     * @param schemeRuleFilterVo
-     * @return
+     *
+     * @param schemeRuleFilterVo 过滤保险公司的条件
+     * @return List<PtlAgreementInsCompanyVo> 满足报价要求的保险公司以及其下的协议
      */
     List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo);
 

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

@@ -137,8 +137,10 @@ public class PtlAgreementCostServiceImpl extends ServiceImpl<PtlAgreementCostMap
         // 校验ptlAgreementCostTypeList 数据  exportKeepPointRatio 不能大于 export
         if (!CollectionUtils.isEmpty(ptlAgreementCostEnd.getPtlAgreementCostTypeList())) {
             for (PtlAgreementCostEnd.PtlAgreementCostTypeDto ptlAgreementCostTypeDto : ptlAgreementCostEnd.getPtlAgreementCostTypeList()) {
-                if (ptlAgreementCostTypeDto.getExportKeepPointRatio().compareTo(ptlAgreementCostTypeDto.getExport()) > 0) {
-                    return HttpResult.error("出口留点比例不能大于出口比例");
+                if (null != ptlAgreementCostTypeDto.getExportKeepPointRatio() && null != ptlAgreementCostTypeDto.getExport()){
+                    if (ptlAgreementCostTypeDto.getExportKeepPointRatio().compareTo(ptlAgreementCostTypeDto.getExport()) > 0) {
+                        return HttpResult.error("出口留点比例不能大于出口比例");
+                    }
                 }
             }
         }

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

@@ -1,9 +1,9 @@
 package com.jzg.organization.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatch;
 import com.jzg.commons.entity.agreement.dispatch.dto.PtlAgreementDispatchAction;
@@ -69,14 +69,12 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
 
     @Autowired
     PtlAgreementDispatchAfterActionMapper afterActionMapper;
-
-    @Autowired
-    BaseController baseController;
-
     @Override
     @Transactional
     public String addAgreementDispatch(PtlAgreementDispatchVo.DispatchVo ptlAgreementDispatchVo) {
+        log.info("添加协议调度信息： ptlAgreementDispatchVo=[{}]", JSONUtil.toJsonStr(ptlAgreementDispatchVo));
         PtlAgreementDispatch dispatch = new PtlAgreementDispatch(ptlAgreementDispatchVo);
+        // ptl_agreement_dispatch 表中插入数据
         baseMapper.insert(dispatch);
 
         for (PtlAgreementDispatchRulesAttrLink link : ptlAgreementDispatchVo.getAttrLinks()){
@@ -84,12 +82,13 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
         }
         rulesAttrLinkMapper.insert(ptlAgreementDispatchVo.getAttrLinks());
 
-        for (PtlAgreementDispatchAction action  : ptlAgreementDispatchVo.getActions()){
-            action.setId(IdGenerate.nextId());
-            action.setDispatchId(dispatch.getId());
+        if(CollUtil.isNotEmpty(ptlAgreementDispatchVo.getActions())){
+            for (PtlAgreementDispatchAction action : ptlAgreementDispatchVo.getActions()){
+                action.setId(IdGenerate.nextId());
+                action.setDispatchId(dispatch.getId());
+            }
+            actionMapper.insert(ptlAgreementDispatchVo.getActions());
         }
-        actionMapper.insert(ptlAgreementDispatchVo.getActions());
-
         return dispatch.getId();
     }
 
@@ -130,7 +129,7 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
         List<String> dispatchIds = ptlAgreementDispatches.stream().map(PtlAgreementDispatch::getId).collect(Collectors.toList());
         if (!dispatchIds.isEmpty()) {
             List<SysDict> dispatchBeforeActionDict = sysDictService.getByTypeCode("dispatch_before_action");
-            List<SysDict> dispatchAfterActionDict = sysDictService.getByTypeCode("dispatch_after_action");
+            //List<SysDict> dispatchAfterActionDict = sysDictService.getByTypeCode("dispatch_after_action");
 
             // 查询保司所有的规则属性 然后进行分组
             List<PtlAgreementDispatchRulesAttrLink> ptlAgreementDispatchRulesAttrLinks = rulesAttrLinkMapper.selectList(new LambdaQueryWrapper<PtlAgreementDispatchRulesAttrLink>()
@@ -220,6 +219,7 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
                 }else{
                     afterAction.setActionName(sysDict.getLabel());
                     if("specify_agreement".equals(afterAction.getActionCode())){
+                        //specify_agreement 指定协议
                         if(afterAction.getActionJson() != null) {
                             PtlAgreement byId = ptlAgreementService.getById(afterAction.getActionJson().get("agreementId").toString());
                             if(byId != null) {
@@ -227,6 +227,7 @@ public class PtlAgreementDispatchServiceImpl extends ServiceImpl<PtlAgreementDis
                             }
                         }
                     }else if("change_bs_account".equals(afterAction.getActionCode())){
+                        // change_bs_account 更换保司账号
                         HttpResult<PtlAgreementAttribution> agreementAttribution = esmInsCompanyClient.getAgreementAttribution(afterAction.getActionJson().get("accountId").toString());
                         if(agreementAttribution.getCode() == 200){
                             PtlAgreementAttribution data = agreementAttribution.getData();

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

@@ -346,19 +346,18 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     @Autowired
     BaseController baseController;
 
+    /**
+     * 规则过滤保险公司
+     *
+     * @param schemeRuleFilterVo 过滤保险公司的条件
+     * @return List<PtlAgreementInsCompanyVo> 满足报价要求的保险公司以及其下的协议
+     */
     @Override
     public List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo) {
         String userSystemCode = baseController.getUserSystemCode();
-        log.info("租户匹配保司以及保司下的协议等信息。 schemeRuleFilterVo=[{}]，userSystemCode=[{}]",
-                JSONUtil.toJsonStr(schemeRuleFilterVo),userSystemCode);
-
-        //如果用户租户code为App  则使用参数传来的租户code
         String systemCode = baseController.getSystemCode();
-
-
-        log.info("getUserSystemCode:{}",baseController.getUserSystemCode());
-        log.info("获取到的租户Code:{}",systemCode);
-
+        log.info("租户匹配保司以及保司下的协议等信息。 schemeRuleFilterVo=[{}]，userSystemCode=[{}],systemCode=[{}]",
+                JSONUtil.toJsonStr(schemeRuleFilterVo),userSystemCode,systemCode);
         //根据权限获取所有保司
         HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode);
         log.info("租户[{}]有权限的保司有[{}]个", systemCode, CollUtil.size(companyListResult.getData()));

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

@@ -49,7 +49,8 @@
         SELECT
         sua.id,suji.name,su.mobile, suji.type_attr as attrType, so.name as organizationName,
         sd.name as deptName, sua.sum_amount as sumAmount, sua.sum_amount_paid as sumAmountPaid,
-        sua.sum_amount_unpaid as sumAmountUnpaid, suji.work_number as workNumber
+        sua.sum_amount_unpaid as sumAmountUnpaid, suji.work_number as workNumber,
+        ( select uu.name from sys_user_jzg_info uu where uu.id = suji.leader_id ) as leaderName
         FROM
         sys_user_account sua
         LEFT JOIN sys_user_jzg_info suji on suji.user_id = sua.user_id

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

@@ -42,7 +42,8 @@
         suji.work_number as workNumber,
         su.mobile as mobile,
         suji.type_attr as typeAttr,
-        ss.sys_name as systemName
+        ss.sys_name as systemName,
+        ( select uu.name from sys_user_jzg_info uu where uu.id = suji.leader_id ) as leaderName
         from
         sys_user_jzg_info_bank_card sujibc
         LEFT JOIN sys_user_jzg_info suji ON suji.id = sujibc.user_info_id