From a9f311e3c80bf4fa4f49936dccf4d919407ec3b4 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 17 四月 2025 10:17:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/business/WorkorderController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/business/WorkorderController.java b/server/src/main/java/com/doumee/api/business/WorkorderController.java
index 0ae2e7f..a8e7979 100644
--- a/server/src/main/java/com/doumee/api/business/WorkorderController.java
+++ b/server/src/main/java/com/doumee/api/business/WorkorderController.java
@@ -111,11 +111,11 @@
}
t.setMemberNames("鏈汉");
if(Constants.equalsInteger(model.getMemberType(),Constants.ONE)){
- t.setMemberNames("鍚屼簨");
- }else if(Constants.equalsInteger(model.getIsHurted(),Constants.TWO)){
+ t.setMemberNames( "鍚屼簨-"+StringUtils.defaultString(model.getMemberNames(),""));
+ }else if(Constants.equalsInteger(model.getMemberType(),Constants.TWO)){
t.setMemberNames("渚涘簲鍟�");
+ t.setMemberNames( "渚涘簲鍟�-"+StringUtils.defaultString(model.getMemberNames(),""));
}
- t.setMemberNames(t.getMemberNames()+"-"+StringUtils.defaultString(model.getMemberNames(),""));
list.add(t);
}
}
--
Gitblit v1.9.3