法大大合同模板检查二级网点的主合同提示明确模板名称

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

@@ -2,6 +2,7 @@ package com.gree.mall.manager.logic.contract;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -384,7 +385,24 @@ public class ContractTemplateLogic {
                         .in(ContractWebsit::getSubWebsitId, item.getSubWebsitId())
                         .count();
                 if (count > 0) {
-                    throw new RemoteServiceException(item.getSubWebsitId() + "的生效日期在" + String.join(",", ids) + "其他主合同的有效期内，请检查");
+                    final List<ContractWebsit> contractWebsitList = contractWebsitService.lambdaQuery()
+                            .select(ContractWebsit::getContractTemplateId)
+                            .in(ContractWebsit::getContractTemplateId, ids)
+                            .in(ContractWebsit::getSubWebsitId, item.getSubWebsitId())
+                            .list();
+
+                    final Set<String> conTractIdSet = contractWebsitList.stream().map(ContractWebsit::getContractTemplateId).collect(Collectors.toSet());
+                    final List<ContractTemplate> templateList = contractTemplateService.lambdaQuery()
+                            .select(ContractTemplate::getContractTemplateName)
+                            .in(ContractTemplate::getContractTemplateId, conTractIdSet)
+                            .list();
+
+                    final List<String> names = templateList.stream().map(ContractTemplate::getContractTemplateName).collect(Collectors.toList());
+
+                    final String joinStr = StrUtil.join(", ", names);
+
+
+                    throw new RemoteServiceException(item.getSubWebsitId() + "的生效日期在" + joinStr + "其他主合同的有效期内，请检查");
                 }
             }
         }