From d7d3e6d3d8add237181db168b21e19b8ffef782d Mon Sep 17 00:00:00 2001
From: shicf <shi_chongfu@163.com>
Date: 星期一, 20 十月 2025 15:09:37 +0800
Subject: [PATCH] 注释
---
src/main/java/com/product/mobile/core/service/FaceMobileService.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 4236b66..7b59f98 100644
--- a/src/main/java/com/product/mobile/core/service/FaceMobileService.java
+++ b/src/main/java/com/product/mobile/core/service/FaceMobileService.java
@@ -17,6 +17,8 @@
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
import com.product.core.service.support.AbstractBaseService;
+import com.product.face.entity.FaceListEntity;
+import com.product.face.service.FaceApplyService;
import com.product.face.util.FaceUtil;
import com.product.mobile.core.config.MobileCoreCode;
import com.product.mobile.core.entity.FaceFieldEntity;
@@ -42,6 +44,8 @@
@Autowired
public BaseDao baseDao;
+ @Autowired
+ private FaceApplyService faceApplyService;
///鑾峰彇琛ㄥ崟鎬诲叆鍙�
/**
@@ -49,7 +53,7 @@
* @param fse浼犲叆琛ㄥ悕锛屾垨 琛║UID
* @return
*/
- public List<FaceFieldEntity> getFaceConfig(FieldSetEntity fse) {
+ public Object getFaceConfig(FieldSetEntity fse) {
String tableUuid = fse.getString("table_uuid");
if (tableUuid == null && StringUtils.isNotEmpty(fse.getString("uuid"))
@@ -80,8 +84,13 @@
}
}
- List<FaceFieldEntity> ls = getFaceFieldByTable(fse);
+ Object o = getFaceFieldByTable(fse);
+ if (o instanceof FaceListEntity) {
+ return o;
+ }
+ List<FaceFieldEntity> ls = (List<FaceFieldEntity>) o;
if (ls == null) ls = new ArrayList<FaceFieldEntity>();
+ //閫掑綊鎶婁富琛ㄥ拰瀛愯〃鐨勫瓧娈靛睘鎬ф坊鍔犺繘鍘伙紝濡傛灉娌℃湁閰嶈〃鍗曪紝鍒欏彇琛ㄦ暟鎹粨鏋勮繘琛屽睍绀�
addproperty(tableUuid, fse.getString("table_name"), ls);
//鎵�鏈夎〃鍗晆uid鑷姩娣诲姞锛屽苟涓篽idden
return ls;
@@ -182,8 +191,8 @@
FaceFieldEntity uuid = new FaceFieldEntity();
FieldSetEntity f = dte.getFieldSetEntity(j);
if ("pk".equals(f.getString("field_type"))
- || "created_by".equals(f.getString("field_name"))
- || "created_utc_datetime".equals(f.getString("field_name"))
+// || "created_by".equals(f.getString("field_name"))
+// || "created_utc_datetime".equals(f.getString("field_name"))
|| "updated_by".equals(f.getString("field_name"))
|| "updated_utc_datetime".equals(f.getString("field_name"))
|| "flowsign".equals(f.getString("field_type"))
@@ -199,10 +208,10 @@
} else {
uuid.setMultiple("0");
}
-
+
if ("userids".equals(f.getString("field_type")) || "userid".equals(f.getString("field_type"))) {
uuid.setOrganizationType("5");
- } else if("orgUuids".equals(f.getString("field_type")) || "orgUuid".equals(f.getString("field_type"))) {
+ } else if ("orgUuids".equals(f.getString("field_type")) || "orgUuid".equals(f.getString("field_type"))) {
uuid.setOrganizationType("2");
}
@@ -229,7 +238,7 @@
}
}
- public List<FaceFieldEntity> getFaceFieldByTable(FieldSetEntity fse) {
+ public Object getFaceFieldByTable(FieldSetEntity fse) {
String tableUuid = fse.getString("table_uuid");
String tableName = fse.getString("table_name");
if (StringUtils.isEmpty(tableUuid) && !StringUtils.isEmpty(tableName)) {
@@ -241,8 +250,13 @@
if (StringUtils.isEmpty(tableUuid)) {
throw new BaseException(MobileCoreCode.SYSTEM_FORM_COUNT);
}
- FieldSetEntity faceFse = getBaseDao().getFieldSetByFilter("product_sys_face", "table_uuid=? and face_type=2", new Object[]{tableUuid}, true);
+ 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);
faceFse.setTableName(tableName);
+ //鍒楄〃锛屼笖鎵惧埌浜嗛厤缃〃鍗曪紝鍙湁鍒楄〃鍗�
+ if ("1".equals(faceType) && !FieldSetEntity.isEmpty(faceFse)) {
+ return faceApplyService.getFaceListConf(faceFse);
+ }
return getFaceField(faceFse);
}
--
Gitblit v1.9.2