no message

mall-server-api/src/main/java/com/gree/mall/manager/bean/contract/ContractWebsitBean.java

@@ -20,6 +20,9 @@ public class ContractWebsitBean extends ContractWebsit {
     @ApiModelProperty(value = "上级网点名称")
     private String parentName;
 
+    @ApiModelProperty(value = "上级网点编号")
+    private String parentId;
+
     @ApiModelProperty(value = "网点名称")
     private String name;
 

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

@@ -73,13 +73,13 @@ public class ContractTemplateLogic {
             if (CollectionUtil.isEmpty(recordList)) {
                 recordList = new ArrayList<>();
             }
-            final Map<String, WebsitContractSignRecord> recordMap = recordList.stream().collect(Collectors.toMap(WebsitContractSignRecord::getWebsitId, Function.identity()));
+            final Map<String, WebsitContractSignRecord> recordMap = recordList.stream().collect(Collectors.toMap(v -> v.getParentId() + v.getWebsitId(), Function.identity()));
             for (ContractWebsitBean item : bean.getItems()) {
-                if (!recordMap.containsKey(item.getSubWebsitId())) {
+                if (!recordMap.containsKey(item.getParentId() + item.getSubWebsitId())) {
                     item.setSignStatus(SignContractStatusEnum.WAIT_SIGN.getRemark());
                     continue;
                 }
-                final WebsitContractSignRecord record = recordMap.get(item.getSubWebsitId());
+                final WebsitContractSignRecord record = recordMap.get(item.getParentId() + item.getSubWebsitId());
 
                 String status = BaseEnum.keyToValueOpt(SignContractStatusEnum.class, record.getStatus()).orElse(SignContractStatusEnum.WAIT_SIGN.getRemark());
                 item.setSignStatus(status);
@@ -146,6 +146,10 @@ public class ContractTemplateLogic {
         this.validRequireParams(contractTemplate);
         this.checkMainDate(contractTemplate);
         ContractTemplate byId = contractTemplateService.getById(contractTemplate.getContractTemplateId());
+        if (!byId.getContractType().equals(contractTemplate.getContractType())) {
+            throw new RemoteServiceException("不能修改合同类型");
+        }
+
         if (!byId.getContractTemplatePdf().equals(contractTemplate.getContractTemplatePdf())) {
             String urlWw = contractTemplate.getContractTemplatePdf();
             String templateId = IdWorker.getIdStr();

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

@@ -1437,6 +1437,7 @@
         SELECT
             a.*,
             d.name AS parent_name,
+            d.websit_id AS parent_id,
             c.name,
             d.belong_company,
             d.belong_company_code