From 6d30a1ef0014acd773f23e0a7dc968d6608f4666 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 15 四月 2025 08:34:20 +0800
Subject: [PATCH] 代码初始化
---
server/src/main/java/com/doumee/service/business/impl/WorkorderServiceImpl.java | 3 ++-
server/src/main/java/com/doumee/dao/business/model/Workorder.java | 3 +++
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/server/src/main/java/com/doumee/dao/business/model/Workorder.java b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
index be90a18..5f4e096 100644
--- a/server/src/main/java/com/doumee/dao/business/model/Workorder.java
+++ b/server/src/main/java/com/doumee/dao/business/model/Workorder.java
@@ -183,6 +183,9 @@
@ApiModelProperty("椋庨櫓绫诲瀷鍚嶇О")
@TableField(exist = false)
private String typeName;
+ @ApiModelProperty("椋庨櫓绫诲瀷瀹屾暣鍚嶇О")
+ @TableField(exist = false)
+ private String typeNamePath;
@ApiModelProperty("浜岀骇涓婚鍚嶇О")
@TableField(exist = false)
private String categoryName;
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..803815e 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())){
--
Gitblit v1.9.3