1

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ContractServiceImpl.java

@@ -181,7 +181,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
                             String msg = "";
                             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                                 msg = "$userName=" + contractLog.get("operateCorpWxId") + "$" + contractLog.get("msg");
-                            }if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+                            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                 msg = "$userName=" + contractLog.get("operateName") + "$" + contractLog.get("msg");
                             }else {
                                 msg = contractLog.get("operateName") + "" + contractLog.get("msg");
@@ -267,7 +267,7 @@ public class ContractServiceImpl extends ServiceImpl<ContractMapper, Contract> i
             item.add(contract.getEndDate()==null?"":contract.getEndDate()+"");
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 contract.setCreatorName("$userName=" + contract.getCreatorWxCorpId() + "$");
-            }if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 contract.setCreatorName("$userName=" + contract.getCreatorName() + "$");
             }else {
                 contract.setCreatorName(contract.getCreatorName());

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/FinanceServiceImpl.java

@@ -1207,7 +1207,7 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
                                 } else {
                                     membRowData.add("");
                                 }
-                            }if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+                            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                                 membRowData.add("$userName="+us.getName()+"$");
                                 if (findDept.isPresent()) {
                                     membRowData.add("$departmentName="+findDept.get().getDepartmentName()+"$");

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ProjectServiceImpl.java

@@ -2795,7 +2795,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
                 User incharger = first.get();
                 if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                     data.add("$userName="+incharger.getCorpwxUserid()+"$");
-                }if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+                }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                     data.add("$userName="+incharger.getDingdingUserid()+"$");
                 }else {
                     data.add(incharger.getName());
@@ -8467,7 +8467,7 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
             List<String> subList=new ArrayList<>();
             if(wxCorpInfo!=null&&wxCorpInfo.getSaasSyncContact()==1){
                 subList.add("$userName="+(item.get("corpwxUserId")==null?"":item.get("corpwxUserId"))+"$");
-            }if(dingding!=null&&dingding.getContactNeedTranslate()==1){
+            }else if(dingding!=null&&dingding.getContactNeedTranslate()==1){
                 subList.add("$userName="+(item.get("corpDdUserId")==null?"":item.get("corpDdUserId"))+"$");
             }else {
                 subList.add(String.valueOf(item.get("username")));