From 1ebf951a1d9676647957e7a319ae281b4a52dd1f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 02 八月 2024 18:45:40 +0800
Subject: [PATCH] 数采公式优化+任务切换sql语法错误+检验下单页面展示的数量和里面的数量不一致

---
 framework/src/main/java/com/yuanchu/mom/common/PrintChina.java |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java b/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
index 0b84598..4cc2726 100644
--- a/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
+++ b/framework/src/main/java/com/yuanchu/mom/common/PrintChina.java
@@ -26,14 +26,12 @@
             Map<String, String> soundVo = new HashMap<>();
             boolean bool = field.isAnnotationPresent(ApiModelProperty.class);
             boolean bool2 = field.isAnnotationPresent(ValueTableShow.class);
-            if (bool) {
-                int order;
-                if (bool2){
-                    order = field.getAnnotation(ValueTableShow.class).value();
-                }else{
-                    continue;
+            if (bool2) {
+                int order = field.getAnnotation(ValueTableShow.class).value();
+                String value = field.getAnnotation(ValueTableShow.class).name();
+                if (bool){
+                    value = value.isEmpty() ? field.getAnnotation(ApiModelProperty.class).value() : value;
                 }
-                String value = field.getAnnotation(ApiModelProperty.class).value();
                 soundVo.put("label", field.getName());
                 soundVo.put("value", value);
                 soundVo.put("order", order + "");

--
Gitblit v1.9.3