no message

mall-server-api/src/main/java/com/gree/mall/manager/commonmapper/CommonMapper.java

@@ -726,5 +726,5 @@ public interface CommonMapper {
 
     List<ContractTemplate> queryNeedContract(@Param("companyId") String companyWechatId,
                                        @Param("websitId") String websitId,
-                                       @Param("onDate") String onDate);
+                                       @Param("onDate") Date onDate);
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminUserLogic.java

@@ -183,7 +183,7 @@ public class AdminUserLogic {
                             .isNull(WebsitContractSignRecord::getCancelTime)
                             .count();
                     if (existCount == 0) {
-                        List<ContractTemplate> contractList = commonMapper.queryNeedContract(adminUser.getCompanyWechatId(), websit.getWebsitId(), DateUtil.formatDate(DateUtil.date()));
+                        List<ContractTemplate> contractList = commonMapper.queryNeedContract(adminUser.getCompanyWechatId(), websit.getWebsitId(), DateUtil.date());
                         if (CollectionUtil.isEmpty(contractList)) {
                             adminUserCom.setContractSignInfo("未发现网点需要签约合同，请联系管理员处理");
                         } else if (CollectionUtil.isNotEmpty(contractList) && contractList.size() > 1) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/contract/ContractTemplateLogic.java

@@ -99,6 +99,7 @@ public class ContractTemplateLogic {
         }
     }
 
+    @Transactional
     public void update(ContractTemplateBean contractTemplate) {
         this.validRequireParams(contractTemplate);
         ContractTemplate byId = contractTemplateService.getById(contractTemplate.getContractTemplateId());
@@ -154,8 +155,8 @@ public class ContractTemplateLogic {
         if (StringUtils.isBlank(contractTemplate.getContractType())) {
             throw new RemoteServiceException("合同类型不能为空");
         }
-        if (contractTemplate.getContractType().equals(ContractTypeEnum.FOLLOW.getKey())) {
-            contractTemplate.setFollowContractTemplateId("");
+        if (contractTemplate.getContractType().equals(ContractTypeEnum.MAIN.getKey())) {
+            contractTemplate.setFollowContractTemplateId(null);
         }
         if (StringUtils.isBlank(contractTemplate.getContractTemplateId())
                 && ContractTypeEnum.MAIN.getKey().equals(contractTemplate.getContractType())

mall-server-api/src/main/resources/mapper/CommonMapper.xml

@@ -1495,8 +1495,7 @@
             AND a.contract_template_id = b.contract_template_id
             AND a.company_wechat_id = #{companyId}
             AND a.sub_websit_id = #{websitId}
-            AND b.valid_date <![CDATA[ >= ]]> #{onDate}
-            AND b.expire_date <![CDATA[ <= ]]> #{onDate}
+            AND #{onDate} BETWEEN b.valid_date AND b.expire_date
             AND b.contract_type = 'MAIN'
             AND b.status = 'ON'
         ORDER BY