From 119b55b59e4d6af0e8881fae671eaa3a1c9fd6ac Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 10 一月 2024 10:26:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
index 1f620f3..e5bf696 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/revision/service/RevisionModelUtil.java
@@ -9,6 +9,7 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -57,7 +58,12 @@
});
tree.setOid((String)oidValues.stream().collect(Collectors.joining(wrapperOptions.getOidValueSep())));
tree.setName((String) VciBaseUtil.getValueFromField("name", doObject));
- tree.setCount("("+(String)VciBaseUtil.getValueFromField("total", doObject)+")");
+ // TODO:涓氬姟鏁版嵁鎬绘暟缁熻鏆傛椂娌″畬鍠�
+ String total = (String) VciBaseUtil.getValueFromField("total", doObject);
+ Integer isParticipateCheck = (Integer) VciBaseUtil.getValueFromField("isParticipateCheck", doObject);
+ if(Func.isNotEmpty(total)){
+ tree.setCount("銆�"+total+"銆�");
+ }
if (f != null) {
tree.setText((String)f.apply(doObject));
} else {
--
Gitblit v1.9.3