From 3cea15af53d4eb5fb9ccdd1b7a31ec494ba41d6c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 四月 2025 09:37:28 +0800
Subject: [PATCH] 代码初始化
---
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
index 6e91141..cfad8ac 100644
--- a/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
+++ b/server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java
@@ -390,6 +390,7 @@
.selectAs(Member::getName,Workorder::getMemberName)
.selectAs(Member::getCompanyName,Workorder::getCompanyName)
.select(" c3.name ",Workorder::getTypeName)
+ .select(" c3.name_path ",Workorder::getTypeNamePath)
.select(" c4.name ",Workorder::getCategoryName)
.leftJoin(Member.class,Member::getId,Workorder::getMemberId)
.leftJoin(" category c3 on t.TYPE_ID = c3.id ") //椋庨櫓绫诲瀷
@@ -428,7 +429,7 @@
public void dealButton(Workorder workorder,Member member){
workorder.setPassOnButton(Constants.ZERO);
workorder.setCloseButton(Constants.ZERO);
- if(org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){
+ if(member!=null && org.apache.commons.lang3.StringUtils.isNotBlank(member.getQwId())){
List<String> closeUserList = new ArrayList<>();
closeUserList.addAll(Arrays.asList(workorder.getQwnoticeMemberIds().split(",")));
if(org.apache.commons.lang3.StringUtils.isNotBlank(workorder.getManagerId())){
@@ -955,9 +956,9 @@
private Map<String, String> getEmailContentFormByModel(Workorder workorder) {
Map<String, String> map = new LinkedHashMap<>();
- map.put("涓婃姤浜�",workorder.getMemberName()+"/" +workorder.getCompanyName());
+ map.put("涓婃姤浜�",workorder.getCompanyName()+"/" +workorder.getMemberName());
map.put("涓婃姤鏃堕棿",DateUtil.getPlusTime2(workorder.getSubmitDate()));
- map.put("浜嬩欢鍙戠敓鏃堕棿/鍦扮偣",DateUtil.getPlusTime2(workorder.getHappenTime())+"/"+workorder.getLocationName());
+ map.put("浜嬩欢鍙戠敓鏃堕棿/鍦扮偣",DateUtil.getPlusTime2(workorder.getHappenTime())+" / "+workorder.getLocationName());
map.put("浼ゅ绫诲瀷", workorder.getTypeName());
map.put("鏄惁澶栭儴灏卞尰", Constants.equalsInteger(workorder.getOutJiuyi(),Constants.ONE)?"鏄�":"鍚�");
map.put("鏄惁鍖诲姟瀹�", Constants.equalsInteger(workorder.getIsYiwushi(),Constants.ONE)?"鏄�":"鍚�");
--
Gitblit v1.9.3