From 04345420e457ccffcfc94646fde4f5a2204164c3 Mon Sep 17 00:00:00 2001
From: 6c <420680616@qq.com>
Date: 星期三, 15 十月 2025 10:31:18 +0800
Subject: [PATCH] 移动端加载mvc

---
 src/main/java/com/product/mobile/core/service/FaceMobileService.java |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/product/mobile/core/service/FaceMobileService.java b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
index f608e99..07f3484 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -30,6 +30,7 @@
 
 import javax.annotation.Resource;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Author cheng
@@ -55,7 +56,7 @@
 	 */
 	public Object getFaceConfig(FieldSetEntity fse) {
 
-		String tableUuid = fse.getString("table_uuid");
+        String tableUuid = fse.getString("table_uuid");
 		if (tableUuid == null && StringUtils.isNotEmpty(fse.getString("uuid"))
 				&& StringUtils.isEmpty(fse.getString("table_name"))) {
 			//閫氳繃涓氬姟琛ㄤ俊鎭煡琛ㄥ崟淇℃伅
@@ -86,12 +87,30 @@
 
 		Object o = getFaceFieldByTable(fse);
 		if (o instanceof FaceListEntity) {
-			return o;
+            FaceListEntity faceListEntity = (FaceListEntity) o;
+            List<FaceListEntity.FaceField> faceFieldList = faceListEntity.getFaceFields();
+            List<JSONObject> objList = faceFieldList.stream().map(faceField -> {
+                JSONObject obj = JSONObject.parseObject(com.alibaba.fastjson.JSONObject.toJSONString(faceField));
+                obj.put("name", obj.getString("columnName"));
+                obj.put("field", obj.getString("fieldName"));
+                return obj;
+            }).collect(Collectors.toList());
+			return objList;
 		}
 		List<FaceFieldEntity> ls = (List<FaceFieldEntity>) o;
 		if (ls == null) ls = new ArrayList<FaceFieldEntity>();
 		addproperty(tableUuid, fse.getString("table_name"), ls);
 		//鎵�鏈夎〃鍗晆uid鑷姩娣诲姞锛屽苟涓篽idden
+
+        // 绉诲姩绔嫢鏄病鏈夐厤缃〃鍗曚俊鎭紝閭d箞灏辨渶澶氭樉绀�10涓瓧娈碉紝涓旈渶瑕佸墧闄ゅ埌閮ㄥ垎瀛楁
+        String clientType = fse.getString("client_type");
+        if ("app".equals(clientType)) {
+            List<String> exceptList = Arrays.asList("uuid", "org_level_uuid", "created_by", "created_utc_datetime");
+            ls = ls.stream().filter(obj -> !exceptList.contains(obj.getField())).collect(Collectors.toList());
+            if (ls.size() > 10) {
+                ls = ls.subList(0, 10);
+            }
+        }
 		return ls;
 
 	}
@@ -250,7 +269,14 @@
 			throw new BaseException(MobileCoreCode.SYSTEM_FORM_COUNT);
 		}
 		String faceType = BaseUtil.ifNull(fse.getString("face_type"), "2");
-		FieldSetEntity faceFse = getBaseDao().getFieldSetByFilter("product_sys_face", "table_uuid=? and face_type=?", new Object[]{tableUuid, faceType}, true);
+        String faceNumber = fse.getString("face_number");
+        String filter = "table_uuid=? and face_type=? AND LENGTH(IFNULL(face_number,''))>0";
+        Object[] paramArr = new Object[]{tableUuid, faceType};
+        if (!StringUtils.isEmpty(faceNumber)) {
+            filter = "face_number=?";
+            paramArr = new Object[]{faceNumber};
+        }
+		FieldSetEntity faceFse = getBaseDao().getFieldSetByFilter("product_sys_face", filter, paramArr, true);
 		faceFse.setTableName(tableName);
 		if ("1".equals(faceType) && !FieldSetEntity.isEmpty(faceFse)) {
 			//鍒楄〃

--
Gitblit v1.9.2