Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/aop/aspect/OperatorTrajectoryAspect.java

@@ -36,9 +36,8 @@ import org.springframework.stereotype.Component;
 
 import java.lang.reflect.Method;
 import java.time.LocalDateTime;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
+import java.util.stream.Collectors;
 
 @Slf4j
 @Aspect
@@ -136,7 +135,13 @@ public class OperatorTrajectoryAspect {
             return StringUtils.join(arg);
         } else if (arg instanceof String) {
             return String.valueOf(arg);
-        } else if (arg != null) {
+        } else if (arg instanceof String[]){
+            StringBuilder argStrBuilrder = new StringBuilder();
+            for (String s : (String[]) arg) {
+                argStrBuilrder.append(s).append(",");
+            }
+            return argStrBuilrder.substring(0, argStrBuilrder.length() - 1);
+        }else if (arg != null) {
             JSONObject jsonObject = (JSONObject) JSON.toJSON(arg);
             return jsonObject.getString(key);
         }
@@ -148,6 +153,10 @@ public class OperatorTrajectoryAspect {
     public void doBefore(JoinPoint point,  OperatorTrajectory operatorTrajectory){
         Object obj = point.getArgs()[0];
         String id = getId(point,operatorTrajectory.primary());
+        List<String> ids = new ArrayList<>();
+        if (Objects.nonNull(id)){
+            ids = Arrays.stream(id.split(",")).collect(Collectors.toList());
+        }
         if (isRecorded(operatorTrajectory.isRecorded(),obj)){
             return;
         }
@@ -183,24 +192,28 @@ public class OperatorTrajectoryAspect {
                 break;
             //更新
             case "U":
-                beforeData = GetSelectIdDataUtils.selectById(operatorTrajectory.entityClass(), operatorTrajectory.mapperClass(), id);
-                trajectory.setPrimaryValue(id);
-                if (!Objects.isNull(beforeData)){
-                    trajectory.setBeforeJson(JSON.toJSONString(beforeData));
+                for (String s : ids) {
+                    beforeData = GetSelectIdDataUtils.selectById(operatorTrajectory.entityClass(), operatorTrajectory.mapperClass(), s);
+                    trajectory.setPrimaryValue(s);
+                    if (!Objects.isNull(beforeData)) {
+                        trajectory.setBeforeJson(JSON.toJSONString(beforeData));
+                    }
+                    trajectory.setOperationContent(DescriptionUtils.generateDescription(beforeData, operatorName));
+                    operatorTrajectoryService.save(trajectory);
                 }
-                trajectory.setOperationContent(DescriptionUtils.generateDescription(beforeData,operatorName));
-                operatorTrajectoryService.save(trajectory);
                 break;
             //删除
             case "D":
-                beforeData = GetSelectIdDataUtils.selectById(operatorTrajectory.entityClass(), operatorTrajectory.mapperClass(), id);
-                trajectory.setPrimaryValue(id);
-                trajectory.setBeforeJson(JSON.toJSONString(beforeData));
-                trajectory.setOperationContent(DescriptionUtils.generateDescription(beforeData,operatorName));
-                operatorTrajectoryService.save(trajectory);
-                break;
-                default:
-                    log.warn("Unsupported operator type: {}", operatorTrajectory.type());
+                for (String s : ids) {
+                    beforeData = GetSelectIdDataUtils.selectById(operatorTrajectory.entityClass(), operatorTrajectory.mapperClass(), s);
+                    trajectory.setPrimaryValue(s);
+                    trajectory.setBeforeJson(JSON.toJSONString(beforeData));
+                    trajectory.setOperationContent(DescriptionUtils.generateDescription(beforeData, operatorName));
+                    operatorTrajectoryService.save(trajectory);
+                    break;
+                }
+            default:
+                log.warn("Unsupported operator type: {}", operatorTrajectory.type());
 
         }
         // 用于验证上下文

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

@@ -1,5 +1,6 @@
 package com.jzg.commons.entity.orders.po;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -13,6 +14,7 @@ import java.time.LocalDateTime;
 @Schema(description = "订单车辆信息表")
 public class InsOrdersCarInfo extends BaseModel {
 
+    @TableId(value = "order_no")
     @Schema(description = "订单号")
     private String orderNo;
 

commons/src/main/java/com/jzg/commons/entity/orders/vo/OrderListVo.java

@@ -96,4 +96,7 @@ public class OrderListVo {
 
     //支付时间
     private LocalDateTime payTime;
+
+    //支付链接
+    private String paymentLink;
 }

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

@@ -21,6 +21,9 @@ public class EsmInsCompanyReq implements Serializable {
     @Schema(description = "parentId")
     private String parentId;
 
+    @Schema(description = "系统code")
+    private String systemCode;
+
 }
 
 

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

@@ -72,6 +72,9 @@ public class SysActivityVo extends PageRequest {
     @Schema(description = "奖品列表")
     private List<AwardList> awardList;
 
+    @Schema(description = "租户编码")
+    private String systemCode;
+
     @Data
     @NoArgsConstructor
     public static class AwardList implements Serializable {

platform/src/main/java/com/jzg/controller/EsmInsCompanyController.java

@@ -2,6 +2,7 @@ package com.jzg.controller;
 
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
@@ -9,6 +10,7 @@ import com.jzg.commons.entity.dto.EsmInsCompanyAdd;
 import com.jzg.commons.entity.dto.EsmInsCompanyEnd;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.SysUploadFiles;
+import com.jzg.commons.entity.system.vo.SysSystemBusPermsVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyReq;
 import com.jzg.commons.entity.vo.EsmInsCompanyResVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyVo;
@@ -21,6 +23,7 @@ import com.jzg.commons.util.StringUtils;
 import com.jzg.constants.ManagementSourceEnum;
 import com.jzg.mapper.SysUploadFilesMapper;
 import com.jzg.service.EsmInsCompanyService;
+import com.jzg.service.SysSystemService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +33,9 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 /**
  * ---------------------------
@@ -289,14 +294,26 @@ public class EsmInsCompanyController extends BaseController {
 //    }
 
 
+    @Autowired
+    SysSystemService sysSystemService;
+
     @Operation(summary = "获取顶级保险公司列表")
     @GetMapping(value = "/gainTopList")
-    public HttpResult<List<EsmInsCompanyResVo>> gainTopList(@RequestParam String type) {
+    public HttpResult<List<EsmInsCompanyResVo>> gainTopList(@RequestParam String type,@RequestParam(required = false) String systemCode) {
         LambdaQueryWrapper<EsmInsCompany> lqw = new LambdaQueryWrapper<>();
         lqw.eq(EsmInsCompany::getParentId, "0");
         lqw.orderByAsc(EsmInsCompany::getOrderNum);
         lqw.eq(StringUtils.isNotEmpty(type), EsmInsCompany::getType, type);
         List<EsmInsCompany> list = esmInsCompanyService.list(lqw);
+        if(Objects.nonNull(systemCode)) {
+            SysSystemBusPermsVo perms = sysSystemService.getBusPerms(systemCode);
+            if (perms.getQuoteCompany() == 2) {
+                List<String> quoteCompanyList = perms.getQuoteCompanyList();
+                if (!CollectionUtils.isEmpty(quoteCompanyList)) {
+                    list = list.stream().filter(r -> quoteCompanyList.contains(r.getId())).collect(Collectors.toList());
+                }
+            }
+        }
         List<EsmInsCompanyResVo> esmInsCompanyResVos = BeanUtil.copyToList(list, EsmInsCompanyResVo.class);
         return HttpResult.ok(esmInsCompanyResVos);
     }

platform/src/main/java/com/jzg/controller/SysSystemController.java

@@ -218,11 +218,16 @@ public class SysSystemController {
 
     @GetMapping("/getBusPerms")
     @Operation(summary = "获取租户业务权限")
-    public HttpResult getBusPerms(String systemCode) {
+    public HttpResult<SysSystemBusPermsVo> getBusPerms(String systemCode) {
         return HttpResult.ok(sysSystemService.getBusPerms(systemCode));
     }
 
-
+    // 根据租户获取保司信息
+    @GetMapping("/getUserCompany")
+    @Operation(summary = "根据租户获取保司信息")
+    public HttpResult getUserCompany(String systemCode) {
+        return HttpResult.ok(sysSystemService.getUserCompany(systemCode));
+    }
     //endregion
 
 }

platform/src/main/java/com/jzg/mapper/SysSystemMapper.java

@@ -3,6 +3,7 @@ package com.jzg.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.dto.SysSystemParam;
+import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.SysSystem;
 import com.jzg.commons.entity.vo.SysSystemVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -33,6 +34,8 @@ public interface SysSystemMapper extends BaseMapper<SysSystem> {
      * @return
      */
     List<SysSystemVo> queryList(@Param("sysSystemVo") SysSystemParam param);
+
+    List<EsmInsCompany> getCompanyList(@Param("companyIds") List<String> companyIds);
 }
 
 

platform/src/main/java/com/jzg/service/SysSystemService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.jzg.commons.entity.dto.SysSystemAddParam;
 import com.jzg.commons.entity.dto.SysSystemEditParam;
 import com.jzg.commons.entity.dto.SysSystemParam;
+import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.SysConfig;
 import com.jzg.commons.entity.po.SysSystem;
 import com.jzg.commons.entity.po.SysSystemPerms;
@@ -174,5 +175,12 @@ public interface SysSystemService extends IService<SysSystem> {
      */
     SysSystemBusPermsVo getBusPerms(String systemCode);
 
+    /**
+     * 根据租户配置获取保司列表
+     * @param systemCode
+     * @return
+     */
+    List<EsmInsCompany> getUserCompany(String systemCode);
+
     //endregion
 }

platform/src/main/java/com/jzg/service/impl/EsmInsCompanyServiceImpl.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.annotation.IgnoreTenant;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.SysUploadFiles;
+import com.jzg.commons.entity.system.po.SysSystemBusPerms;
+import com.jzg.commons.entity.system.vo.SysSystemBusPermsVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyReq;
 import com.jzg.commons.entity.vo.EsmInsCompanyResVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyVo;
@@ -14,7 +16,9 @@ import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.commons.util.StringUtils;
 import com.jzg.mapper.EsmInsCompanyMapper;
+import com.jzg.mapper.SysSystemBusPermsMapper;
 import com.jzg.service.EsmInsCompanyService;
+import com.jzg.service.SysSystemService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -22,6 +26,7 @@ import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
@@ -44,6 +49,9 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
 //        return esmInsCompanies;
 //    }
 
+    @Autowired
+    SysSystemService sysSystemService;
+
     @Override
     public List<EsmInsCompanyVo> findTree(EsmInsCompanyReq req) {
         List<EsmInsCompanyVo> allList  = baseMapper.findTree(req);
@@ -53,6 +61,15 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
         List<EsmInsCompanyVo> list;
         list = allList.stream().filter(r -> r.getParentId().equalsIgnoreCase("0")).collect(Collectors.toList());
         findChildren(list, allList);
+        if(Objects.nonNull(req.getSystemCode())) {
+            SysSystemBusPermsVo perms = sysSystemService.getBusPerms(req.getSystemCode());
+            if (perms.getQuoteCompany() == 2) {
+                List<String> quoteCompanyList = perms.getQuoteCompanyList();
+                if (!CollectionUtils.isEmpty(quoteCompanyList)) {
+                    list = list.stream().filter(r -> quoteCompanyList.contains(r.getId())).collect(Collectors.toList());
+                }
+            }
+        }
         return list;
     }
 

platform/src/main/java/com/jzg/service/impl/SysSystemServiceImpl.java

@@ -546,6 +546,17 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         return sysSystemBusPermsVo;
     }
 
+    @Override
+    public List<EsmInsCompany> getUserCompany(String systemCode) {
+        SysSystemBusPermsVo busPerms = getBusPerms(systemCode);
+        List<String> companyIds = new ArrayList<>();
+        if(busPerms.getQuoteCompany() == 2){
+            companyIds = busPerms.getQuoteCompanyList();
+        }
+        List<EsmInsCompany> companyList = baseMapper.getCompanyList(companyIds);
+        return companyList;
+    }
+
 }
 
 

platform/src/main/resources/mapper/SysSystemMapper.xml

@@ -79,4 +79,37 @@
         </where>
         ORDER BY create_time DESC
     </select>
+
+    <select id="getCompanyList" resultType="com.jzg.commons.entity.po.EsmInsCompany">
+        SELECT
+            eic.id,
+            eic.code,
+            eic.company_code,
+            eic.name,
+            eic.parent_id,
+            eic.name_simple,
+            eic.remark,
+            eic.order_num,
+            eic.cn_name,
+            eic.type,
+            count(psi.id) as count,
+            suf.file_name as logo
+        FROM
+            esm_ins_company eic
+                left join sys_upload_files suf on eic.logo = suf.id
+                left join ptl_scheme ps on eic.id = ps.company_id
+                left join ptl_scheme_info psi on ps.id = psi.scheme_id
+        WHERE
+            eic.parent_id = 0
+          AND
+            eic.is_delete = 0
+        <if test="companyIds != null and companyIds.size() > 0">
+            and eic.id in
+            <foreach collection="companyIds" item="item" index="index" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        group by eic.id
+        order by count desc
+    </select>
 </mapper>

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

@@ -108,6 +108,9 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     @Autowired
     private InsOrdersCarInfoMapper insOrdersCarInfoMapper;
 
+    @Autowired
+    private InsOrdersCarInfoService insOrdersCarInfoService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -770,7 +773,7 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
         // 检测主订单是否存在
         InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getId,orderNo));
         AssertionUtils.isFail(Objects.isNull(insOrders),"订单不存在");
-        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoMapper.selectById(insOrders.getId());
+        InsOrdersCarInfo insOrdersCarInfo = insOrdersCarInfoService.getById(insOrders.getId());
         //设置订单状态
         StateResult stateResult = orderStateListener.statusChange(orderStatusResultVo.getOrderStatus(), insOrders.getOrderStatus());
         // 同步订单轨迹

tenant/insurance/quotation-summary/src/main/resources/application.yaml

@@ -26,6 +26,11 @@ spring:
   servlet:
     multipart:
       max-file-size: 10MB
+  thymeleaf:
+    prefix: classpath:/template/html/
+    suffix: .html
+    encoding: UTF-8
+    cache: false
 
 mybatis-plus:
   mapper-locations: classpath*:/mapper/*Mapper.xml
@@ -84,8 +89,8 @@ image:
 
 # 支付码相关配置
 qrcode:
-  genAddress: https://localhost:8001/order/qrCode/index
-  imageSrc: https://localhost:8001/template/
+  genAddress: https://192.168.0.106:8001/order/qrCode/index
+  imageSrc: https://192.168.0.106:8001/template/
 
 
 yc:

tenant/insurance/quotation-zhongmei/src/main/java/com/jzg/quotation/zhongmei/api/service/impl/ZhongMeiApiRequestImpl.java

@@ -390,6 +390,7 @@ public class ZhongMeiApiRequestImpl implements ZhongMeiApiRequest {
             if ("核保通过".equals(underWriteInd) || "自动核保".equals(underWriteInd)) {
                 orderStatusResultVo.setPaymentLink(submitStatusQueryResponse.getPayUrl());
                 orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.PAY_PENDING);
+                orderStatusResultVo.setPaymentLink(submitStatusQueryResponse.getPayUrl());
                 //当状态为核保不通过时，调整保单状态为核保失败
             } else if ("核保不通过".equals(underWriteInd)) {
                 orderStatusResultVo.setOrderStatus(InsOrderStatusEnum.AUDIT_FAIL);

tenant/organization/src/main/java/com/jzg/organization/client/EsmInsCompanyClient.java

@@ -2,10 +2,13 @@ package com.jzg.organization.client;
 
 import com.jzg.commons.core.page.HttpResult;
 import com.jzg.commons.entity.po.EsmInsCompany;
+import com.jzg.commons.entity.system.vo.SysSystemBusPermsVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @FeignClient(name="jzg-platform",url = "http://localhost:8001/")
 public interface EsmInsCompanyClient {
 
@@ -18,4 +21,17 @@ public interface EsmInsCompanyClient {
     @GetMapping("/esmInsCompany/findById")
     public HttpResult<EsmInsCompany> findById(@RequestParam String id);
 
+    @GetMapping("/system/getBusPerms")
+    public HttpResult<SysSystemBusPermsVo> getBusPerms(@RequestParam String systemCode);
+
+    /**
+     * 获取用户的保司信息
+     * @param systemCode
+     * @return
+     */
+    @GetMapping("/system/getUserCompany")
+    public HttpResult<List<EsmInsCompany>> getUserCompany(@RequestParam String systemCode);
+
+
+
 }

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

@@ -157,7 +157,7 @@ public class AgreementController extends BaseController {
      *
      * @param ids 主键串
      */
-    @OperatorTrajectory(moduleName = "报价配置/协议管理/(启用、禁用)协议",primary = "ids",OperationDict = OperationTypeEnum.DELETE, type = "D", mapperClass = PtlAgreementMapper.class,entityClass = AgreementAddParam.class)
+    @OperatorTrajectory(moduleName = "报价配置/协议管理/(启用、禁用)协议",primary = "id",OperationDict = OperationTypeEnum.DELETE, type = "D", mapperClass = PtlAgreementMapper.class,entityClass = AgreementAddParam.class)
     @Operation(summary = "批量删除协议")
     @DeleteMapping("/agreementDelete")
     public HttpResult agreementDelete(String[] ids) {

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

@@ -64,8 +64,8 @@ public class SchemeController {
 
     @Operation(summary = "获取保司列表,用于方案排序")
     @GetMapping("/getCompanyList")
-    public HttpResult getCompanyList(){
-        return HttpResult.ok(ptlSchemeService.getCompanyList());
+    public HttpResult getCompanyList(String systemCode){
+        return HttpResult.ok(ptlSchemeService.getCompanyList(systemCode));
     }
 
     @Operation(summary = "规则过滤保险公司")

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

@@ -67,7 +67,7 @@ public interface PtlSchemeService extends IService<PtlScheme> {
      * 保司列表
      * @return
      */
-    public List<EsmInsCompanyResVo> getCompanyList();
+    public List<EsmInsCompanyResVo> getCompanyList(String systemCode);
 
     /**
      * 规则过滤保险公司

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

@@ -4,11 +4,14 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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.po.EsmInsCompany;
 import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
 import com.jzg.commons.entity.scheme.po.*;
 import com.jzg.commons.entity.scheme.vo.*;
+import com.jzg.commons.entity.system.po.SysSystemBusPerms;
+import com.jzg.commons.entity.system.vo.SysSystemBusPermsVo;
 import com.jzg.commons.entity.vo.EsmInsCompanyResVo;
 import com.jzg.commons.exception.NoneException;
 import com.jzg.commons.exception.ValidateException;
@@ -16,6 +19,7 @@ import com.jzg.commons.util.AssertionUtils;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.costsorrule.model.ValidateSchemeRuleVo;
 import com.jzg.organization.client.CostsRuleClient;
+import com.jzg.organization.client.EsmInsCompanyClient;
 import com.jzg.organization.mapper.*;
 import com.jzg.organization.service.PtlAgreementService;
 import com.jzg.organization.service.PtlAgreementUndwrtRulesAttrService;
@@ -293,15 +297,23 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
     }
 
     @Override
-    public List<EsmInsCompanyResVo> getCompanyList() {
-        List<EsmInsCompany> companyList = ptlSchemeMapper.getCompanyList();
+    public List<EsmInsCompanyResVo> getCompanyList(String systemCode) {
+        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(systemCode);
+        List<EsmInsCompany> companyList = companyListResult.getData();
         return BeanUtil.copyToList(companyList, EsmInsCompanyResVo.class);
     }
 
+    @Autowired
+    EsmInsCompanyClient esmInsCompanyClient;
+
+    @Autowired
+    BaseController baseController;
+
     @Override
     public List<PtlAgreementInsCompanyVo> ruleFilterCompany(SchemeRuleFilterVo schemeRuleFilterVo){
         //根据权限获取所有保司
-        List<EsmInsCompany> companyList = ptlSchemeMapper.getCompanyList();
+        HttpResult<List<EsmInsCompany>> companyListResult = esmInsCompanyClient.getUserCompany(baseController.getUserSystemCode());
+        List<EsmInsCompany> companyList = companyListResult.getData();
         //根据基本规则 能源、车辆类型、使用性质获取方案
         List<PtlScheme> ptlSchemes = ptlSchemeMapper.selectList(new LambdaQueryWrapper<PtlScheme>()
                 .eq(PtlScheme::getEnergyType, schemeRuleFilterVo.getCarInfo().getEnergyTypeCode())

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

@@ -266,6 +266,7 @@ public class SysActivityServiceImpl extends ServiceImpl<SysActivityMapper, SysAc
 
     @Override
     public Page<SysActivity> getActivityList(Page page,SysActivityVo sysActivityVo) {
+        sysActivityVo.setSystemCode(controller.getUserSystemCode());
         Page<SysActivity> pages = baseMapper.getSysActivityList(page,sysActivityVo);
         pages.getRecords().forEach(activity -> {
             SysDept sysDept = sysDeptService.getById(activity.getActDept());
@@ -276,7 +277,14 @@ public class SysActivityServiceImpl extends ServiceImpl<SysActivityMapper, SysAc
                 activity.setActDeptName(sysDept.getName());
                 activity.setDepts(activity.getDeptIds().stream().map(deptId -> sysDeptService.getById(deptId).getName()).collect(Collectors.joining(",")));
             }
-            activity.setUserCount("0"+"人");
+            // 活动参与人数
+            long user = 0;
+            List<String> deptIds = activity.getDeptIds();
+            for (String deptId : deptIds) {
+                long count = sysUserJzgInfoService.count(new LambdaQueryWrapper<SysUserJzgInfo>().eq(SysUserJzgInfo::getDeptId, deptId));
+                user  += count;
+            }
+            activity.setUserCount(String.valueOf(user));
             checkActivityStatus(activity.getActStartTime(), activity.getActEndTime(), activity);
             updateById(activity);
         });

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

@@ -6,6 +6,7 @@
             sa.id as id,
             sa.act_dept as actDept,
             sa.act_name as actName,
+            sd.name as actDeptName,
             sa.act_method as actMethod,
             sa.act_start_time as actStartTime,
             sa.act_end_time as actEndTime,
@@ -23,6 +24,7 @@
             1=1
           and sa.is_delete = '0'
           and sa.is_end = '0'
+          and sd.system_code = #{sysActivityVo.systemCode}
         <if test="sysActivityVo.actName != null and sysActivityVo.actName != ''">
             and sa.act_name like concat('%',#{sysActivityVo.actName},'%')
         </if>