From b119f3a31de2a459b56e7fde5dbd02d58a148f72 Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期二, 06 六月 2023 18:08:39 +0800
Subject: [PATCH] 表单bug
---
src/main/java/com/product/face/entity/FaceListEntity.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/product/face/entity/FaceListEntity.java b/src/main/java/com/product/face/entity/FaceListEntity.java
index 047830c..fe06c54 100644
--- a/src/main/java/com/product/face/entity/FaceListEntity.java
+++ b/src/main/java/com/product/face/entity/FaceListEntity.java
@@ -1,5 +1,6 @@
package com.product.face.entity;
+import com.alibaba.fastjson.JSON;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.product.admin.config.CmnConst;
@@ -13,6 +14,7 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.spring.context.SpringBeanUtil;
import com.product.core.spring.context.SpringMVCContextHolder;
+import com.product.face.config.FaceConst;
import com.product.module.sys.entity.SystemUser;
import com.product.util.BaseUtil;
@@ -217,12 +219,15 @@
}
//瀛楁鍚嶇О
String fieldName = faceField.getFieldName();
+ if (!StringUtils.isEmpty(fieldName)) {
+ fieldName.trim();
+ }
if (aliasField != null && !StringUtils.isEmpty(fieldName)) {
List<String> fieldAlias = aliasField.get(getTableName() + "." + fieldName);
if (fieldAlias != null && fieldAlias.size() > 0) {
String alias = fieldAlias.get(0);
if (!StringUtils.isEmpty(alias)) {
- fieldName = alias;
+ fieldName = alias.trim();
}
}
}
@@ -244,7 +249,7 @@
}
FieldSetEntity ff = prompt.getFieldSetEntity(0);
StringBuilder p = new StringBuilder();
- p.append(getFieldName(tableAlias, fieldName)).append("` in ").append(" ( SELECT `").append(ff.getString("value_field")).append("` FROM ").append(ff.getString("source_table"));
+ p.append(getFieldName(tableAlias, fieldName)).append(" in ").append(" ( SELECT ").append(ff.getString("value_field")).append(" FROM ").append(ff.getString("source_table"));
p.append(" WHERE ").append(ff.getString("view_fields")).append(" like concat('%','~val~','%') )");
filters.add(p.toString());
continue;
@@ -258,7 +263,7 @@
//鑾峰彇redis 璧峰key
String faceListKey = SystemFaceService.FACE_LIST_KEY;
//閲嶆柊鏀惧叆redis
- RedisUtil.set(faceListKey + getUuid(), this);
+ RedisUtil.set(faceListKey + getUuid(), JSON.parseObject(JSON.toJSONString(this), com.product.admin.entity.FaceListEntity.class));
return maps;
}
--
Gitblit v1.9.2