Merge remote-tracking branch 'origin/master'

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/aspect/QuoteVerificationAspect.java

@@ -622,7 +622,7 @@ public class QuoteVerificationAspect {
         if (sysDistributionSetting != null) {
             // 判断业务员所属机构是否被排除
             // 1.获取业务员所属机构
-            String deptId = baseController.getUserDeptId();
+            String deptId = sysUserJzgInfoResult.getData().getDeptId();
             HttpResult<SysDeptVo> sysDept = orgClient.deptGet(deptId);
             if (sysDept.getData() != null && sysDept.getData().getIsDistribution().equals("1")) {
                 // 获取租户分销设置为几级分销

tenant/insurance/quotation-taishan/src/main/java/com/jzg/quotation/taishan/crawler/component/TaiShanDuplicateInsuranceComponents.java

@@ -35,6 +35,11 @@ public class TaiShanDuplicateInsuranceComponents extends ResponseMessageAbstract
     private TaiShanCrawlerRequestComponent taiShanCrawlerRequestComponent;
 
     protected static final Map<Integer, String> dateFormatMap = new HashMap<>();
+    static {
+        dateFormatMap.put(12, "yyyyMMddHHmm");
+        dateFormatMap.put(14, "yyyyMMddHHmmss");
+        dateFormatMap.put(8, "yyyyMMdd");
+    }
 
     public static final String THE_JQ_FIRST_REGEX = "日期 (\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2})";
     public static final String THE_SY_FIRST_REGEX = "日期：(\\d{12})";

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

@@ -91,7 +91,6 @@ public class AgreementController extends BaseController {
                 0,           // 内部协议
                 startDate
         );
-        AssertionUtils.isFail(nameExists,"协议名称已存在，请输入其他名称");
 
         // 3. 执行新增
         agreementService.agreementAdd(param);
@@ -120,7 +119,6 @@ public class AgreementController extends BaseController {
                 0,             // 内部协议
                 startDate
         );
-        AssertionUtils.isFail(nameExists,"协议名称已存在，请输入其他名称");
 
         // 3. 执行修改
         agreementService.agreementEdit(param);
@@ -236,7 +234,6 @@ public class AgreementController extends BaseController {
                 1,           // 外部协议
                 startDate
         );
-        AssertionUtils.isFail(nameExists,"协议名称已存在，请输入其他名称");
 
         // 3. 执行保存
         agreementService.contactAdd(param);
@@ -267,7 +264,6 @@ public class AgreementController extends BaseController {
                 1,            // 外部协议
                 startDate
         );
-        AssertionUtils.isFail(nameExists,"协议名称已存在，请输入其他名称");
 
         // 3. 执行修改
         agreementService.contactEdit(param);