修改bug

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;
+
 }
 
 

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/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/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);
 
     /**
      * 规则过滤保险公司