功能配置

authentication/src/main/java/com/jzg/config/JzgAuthenticationProvider.java

@@ -81,6 +81,9 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
             throw new SystemException("该租户已经禁用或者删除，请联系运营平台！");
         }
         SysUser byId = sysUserService.getByUserName(username);
+        if(Objects.isNull(byId)){
+            throw new SystemException("用户名不存在");
+        }
         String salt = byId.getSalt();
 
         // 加密密码和盐值

commons/src/main/java/com/jzg/commons/constants/SystemBusPermsConstants.java

@@ -14,7 +14,7 @@ public enum SystemBusPermsConstants {
     ORDER_AUDIT_DEPT_BUS(2,"orderAuditDept","订单审核机构"),
     SALESMAN_AUDIT_DEPT(3,"salesmanAuditDept","业务员审核机构"),
     SALESMAN_WITHDRAW_ACCOUNT_AUDIT_DEPT(4,"salesmanWithdrawAccountAuditDept","业务员提现账号审核机构"),
-    SALESMAN_WITHDRAW_PAYMENT_AUDIT_DEPT(5,"salesmanWithdrawPaymentAuditDept","业务员提现申请付款审核机构"),;
+    SALESMAN_WITHDRAW_PAYMENT_AUDIT_DEPT(5,"salesmanWithdrawPaymentAuditDept","业务员提现申请付款审核机构");
 
     private Integer id;
     private String code;

commons/src/main/java/com/jzg/commons/entity/system/po/SysSystemBusPerms.java

@@ -34,22 +34,22 @@ public class SysSystemBusPerms implements Serializable {
     private String systemCode;
 
     @Schema(description = "支持报价的保司")
-    private String quoteCompany;
+    private Integer quoteCompany;
 
     @Schema(description = "出单方式")
-    private String orderMode;
+    private Integer orderMode;
 
     @Schema(description = "订单审核机构")
-    private String orderAuditDept;
+    private Integer orderAuditDept;
 
     @Schema(description = "业务员审核机构")
-    private String salesmanAuditDept;
+    private Integer salesmanAuditDept;
 
     @Schema(description = "业务员提现账号审核机构")
-    private String salesmanWithdrawAccountAuditDept;
+    private Integer salesmanWithdrawAccountAuditDept;
 
     @Schema(description = "业务员提现申请付款审核机构")
-    private String salesmanWithdrawPaymentAuditDept;
+    private Integer salesmanWithdrawPaymentAuditDept;
 
 
     public SysSystemBusPerms(SysSystemBusPermsVo sysSystemBusPermsVo) {

commons/src/main/java/com/jzg/commons/entity/system/vo/SysSystemBusPermsVo.java

@@ -7,6 +7,7 @@ import com.jzg.commons.entity.system.po.SysSystemBusPermsLink;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -21,6 +22,7 @@ import java.util.stream.Collectors;
 @Data
 @Schema(description = "系统业务权限")
 @AllArgsConstructor
+@NoArgsConstructor
 public class SysSystemBusPermsVo implements Serializable {
 
     @Schema(description = "主键")
@@ -34,34 +36,34 @@ public class SysSystemBusPermsVo implements Serializable {
     private String systemCode;
 
     @Schema(description = "支持报价的保司")
-    private String quoteCompany;
+    private Integer quoteCompany;
 
     @Schema(description = "报价的保司")
     private List<String> quoteCompanyList = new ArrayList<>();
 
     @Schema(description = "出单方式")
-    private String orderMode;
+    private Integer orderMode;
 
     @Schema(description = "订单审核机构")
-    private String orderAuditDept;
+    private Integer orderAuditDept;
 
     @Schema(description = "订单审核指定机构")
     private List<String> orderAuditDeptList = new ArrayList<>();
 
     @Schema(description = "业务员审核机构")
-    private String salesmanAuditDept;
+    private Integer salesmanAuditDept;
 
     @Schema(description = "业务员审核指定机构")
     private List<String> salesmanAuditDeptList = new ArrayList<>();
 
     @Schema(description = "业务员提现账号审核机构")
-    private String salesmanWithdrawAccountAuditDept;
+    private Integer salesmanWithdrawAccountAuditDept;
 
     @Schema(description = "业务员提现账号审核指定机构")
     private List<String> salesmanWithdrawAccountAuditDeptList = new ArrayList<>();
 
     @Schema(description = "业务员提现申请付款审核机构")
-    private String salesmanWithdrawPaymentAuditDept;
+    private Integer salesmanWithdrawPaymentAuditDept;
 
     @Schema(description = "业务员提现申请付款审核指定机构")
     private List<String> salesmanWithdrawPaymentAuditDeptList = new ArrayList<>();

gateway/src/main/resources/application-dev.yml

@@ -28,6 +28,6 @@ spring:
         - id: tenant_route
           uri: http://localhost:8084/
           predicates:
-            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**,/message/**,/messageNotice/**,/poster/**,/agreement/**,/pltAgreement/**,/agreementRules/**,/plt/areaLicense/**,/ptlAgreementCost/**,/ptlAgreementCostExternal/**
+            - Path=/tenant/**,/dept/**,/area/**,/dict/**,/userInfo/**,/sysOrganization/**,/activity/**,/message/**,/messageNotice/**,/poster/**,/agreement/**,/pltAgreement/**,/agreementRules/**,/plt/areaLicense/**,/scheme/**,/schemeRules/**,/schemeRulesAttrLink/**,/schemeRulesAttr/**,/schemeRulesDictLable/**,/schemeRulesUndwrt/**,/schemeRulesUndwrtAttrLink/**,/schemeRulesUndwrtAttr/**,/schemeRulesUndwrtDictLable/**,/schemeRulesUndwrtRules/**,/schemeRulesUndwrtRulesAttrLink/**,/schemeRules,/ptlAgreementCost/**,/ptlAgreementCost/**,/ptlAgreementCostExternal/**
 
 

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

@@ -63,6 +63,13 @@ public class SysDeptController extends BaseController {
     }
 
 
+    @Operation(summary = "根据租户code机构列表查询")
+    @GetMapping(value = "/getDeptListBySystemCode")
+    public HttpResult<List<SysDept>> getDeptListBySystemCode(String systemCode){
+        List<SysDept> deptList = sysDeptService.getDeptListBySystemCode(systemCode);
+        return HttpResult.ok(deptList);
+    }
+
     /**
      * 机构信息查询
      * @param id

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

@@ -206,7 +206,7 @@ public class SysSystemController {
     @PostMapping("/saveBusPerms")
     @Operation(summary = "保存租户业务权限")
     public HttpResult saveBusPerms(@RequestBody SysSystemBusPermsVo sysSystemBusPermsVo) {
-        return HttpResult.ok(sysSystemService.saveBusPerms(sysSystemBusPermsVo));
+        return HttpResult.ok(sysSystemService.saveBusPerms(sysSystemBusPermsVo) ? "保存租户业务权限成功" : "保存租户业务权限失败");
     }
 
 

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

@@ -42,4 +42,12 @@ public interface SysDeptService extends IService<SysDept> {
      * @return
      */
     SysDeptVo queryById(String id);
+
+
+    /**
+     * 根据系统编码获取机构列表
+     * @param systemCode
+     * @return
+     */
+    List<SysDept> getDeptListBySystemCode(String systemCode);
 }

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

@@ -160,8 +160,19 @@ public interface SysSystemService extends IService<SysSystem> {
 
     //region 租户业务权限配置
 
+    /**
+     * 保存租户业务权限
+     * @param sysSystemBusPermsVo
+     * @return
+     */
     boolean saveBusPerms(SysSystemBusPermsVo sysSystemBusPermsVo);
 
+    /**
+     * 获取租户业务权限
+     * @param systemCode
+     * @param companyId
+     * @return
+     */
     SysSystemBusPermsVo getBusPerms(String systemCode,String companyId);
 
     //endregion

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

@@ -4,6 +4,7 @@ package com.jzg.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.vo.EsmInsCompanyReq;
@@ -226,6 +227,7 @@ public class EsmInsCompanyServiceImpl extends ServiceImpl<EsmInsCompanyMapper, E
      * @return
      */
     @Override
+    @IgnoreTenant
     public List<EsmInsCompanyResVo> liveCompanyList() {
         return baseMapper.liveCompanyList();
     }

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

@@ -221,4 +221,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         return sysDeptVo;
     }
 
+    @Override
+    public List<SysDept> getDeptListBySystemCode(String systemCode) {
+        return sysDeptMapper.selectList(new LambdaQueryWrapper<SysDept>().eq(SysDept::getSystemCode, systemCode));
+    }
+
 }

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

@@ -504,7 +504,7 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public boolean saveBusPerms(SysSystemBusPermsVo sysSystemBusPermsVo) {
         SysSystemBusPerms sysSystemBusPerms = new SysSystemBusPerms(sysSystemBusPermsVo);
         sysSystemBusPermsMapper.insertOrUpdate(sysSystemBusPerms);
@@ -513,12 +513,16 @@ public class SysSystemServiceImpl extends ServiceImpl<SysSystemMapper, SysSystem
         sysSystemBusPermsLinkMapper.delete(new LambdaQueryWrapper<SysSystemBusPermsLink>()
                 .eq(SysSystemBusPermsLink::getPermsId, sysSystemBusPermsVo.getId())
         );
+        sysSystemBusPermsLink.forEach(link->{
+            link.setPermsId(sysSystemBusPerms.getId());
+        });
         sysSystemBusPermsLinkMapper.insert(sysSystemBusPermsLink);
         return true;
     }
 
     @Override
     public SysSystemBusPermsVo getBusPerms(String systemCode,String companyId) {
+
         SysSystemBusPerms sysSystemBusPerms = sysSystemBusPermsMapper.selectOne(new LambdaQueryWrapper<SysSystemBusPerms>()
                 .eq(SysSystemBusPerms::getSystemCode, systemCode)
                 .eq(SysSystemBusPerms::getCompanyId, companyId));

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

@@ -108,7 +108,7 @@
             eic.remark
         FROM
             ptl_agreement pa
-                LEFT JOIN esm_ins_company eic ON pa.insurance_company_id = eic.id
+                LEFT JOIN esm_ins_company eic ON pa.company_id = eic.id
         where
             pa.is_external = 0
         GROUP BY

tenant/costsorrule/src/main/java/com/jzg/costsorrule/mapper/PtlAgreementUndwrtRulesAttrMapper.java

@@ -0,0 +1,9 @@
+package com.jzg.costsorrule.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.jzg.commons.entity.po.PtlAgreementUndwrtRulesAttr;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface PtlAgreementUndwrtRulesAttrMapper extends BaseMapper<PtlAgreementUndwrtRulesAttr> {
+}