From e1c870f744821d2ccb822379c2a12fa354d972f2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 16 四月 2025 14:35:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/src/main/java/com/doumee/api/business/WorkorderController.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 7813df5..0ae2e7f 100644
--- a/server/src/main/java/com/doumee/api/business/WorkorderController.java
+++ b/server/src/main/java/com/doumee/api/business/WorkorderController.java
@@ -110,6 +110,11 @@
}
}
t.setMemberNames("鏈汉");
+ if(Constants.equalsInteger(model.getMemberType(),Constants.ONE)){
+ t.setMemberNames("鍚屼簨");
+ }else if(Constants.equalsInteger(model.getIsHurted(),Constants.TWO)){
+ t.setMemberNames("渚涘簲鍟�");
+ }
t.setMemberNames(t.getMemberNames()+"-"+StringUtils.defaultString(model.getMemberNames(),""));
list.add(t);
}
@@ -160,6 +165,6 @@
@GetMapping("/{id}")
@RequiresPermissions("business:workorder:query")
public ApiResponse findById(@PathVariable Integer id) {
- return ApiResponse.success(workorderService.getDetail(id));
+ return ApiResponse.success(workorderService.getDetail(id,null));
}
}
--
Gitblit v1.9.3