Merge remote-tracking branch 'origin/develop' into develop

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

@@ -159,7 +159,9 @@ public class ContractTemplateLogic {
         final List<ContractWebsitBean> websitBeanList = BeanUtil.copyToList(websitList, ContractWebsitBean.class);
         bean.setItems(websitBeanList);
 
-        this.checkMainDate(bean);
+        if (status.getKey().equals(StateEnum.ON.getKey())) {
+            this.checkMainDate(bean);
+        }
         ContractTemplate contractTemplate = new ContractTemplate();
         contractTemplate.setStatus(status.getKey())
                 .setContractTemplateId(contractTemplateId)

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerTeamLogic.java

@@ -157,8 +157,8 @@ public class WorkerTeamLogic {
             workerTeam.setCompanyWechatId(companyWechatId)
                     .setCompanyWechatName(companyName)
                     .setWebsitId(row.get(0).toString().trim())
-                    .setMasterWorkerId(row.get(0).toString().trim())
-                    .setAssistantWorkerId(row.get(0).toString().trim())
+                    .setMasterWorkerId(row.get(1).toString().trim())
+                    .setAssistantWorkerId(row.get(2).toString().trim())
                     .setStatus(StateEnum.ON.getKey());
             workerTeamList.add(workerTeam);
         }