From 2a6e27f1c0064690d6fc6ab137d64c02fc0742da Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期一, 16 六月 2025 16:16:09 +0800 Subject: [PATCH] 1 --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java index 40807f5..af1c34c 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java @@ -400,8 +400,12 @@ if (null != this.oriLoc) { oriDesc = "LOC" + " - " + this.getOriLoc$(); } - if (!Cools.isEmpty(oriDesc) && null != this.oriCode) { - oriDesc = oriDesc + " (" + this.getOriCode$() + ")"; + if (!Cools.isEmpty(oriDesc)) { + if (null != this.oriCode) { + oriDesc = oriDesc + " (" + this.getOriCode$() + ")"; + } + } else { + oriDesc = "CODE" + " - " + this.getOriCode$(); } return oriDesc; } @@ -414,8 +418,12 @@ if (null != this.destLoc) { destDesc = "LOC" + " - " + this.getDestLoc$(); } - if (!Cools.isEmpty(destDesc) && null != this.destCode) { - destDesc = destDesc + " (" + this.getDestCode$() + ")"; + if (!Cools.isEmpty(destDesc)) { + if (null != this.destCode) { + destDesc = destDesc + " (" + this.getDestCode$() + ")"; + } + } else { + destDesc = "CODE" + " - " + this.getDestCode$(); } return destDesc; } -- Gitblit v1.9.1