From ce569a7d03a6bbb9aa77100ceee62b66b307724f Mon Sep 17 00:00:00 2001
From: 许鹏程 <1821349743@qq.com>
Date: 星期五, 15 十一月 2024 16:29:21 +0800
Subject: [PATCH] 增加image字段类型上传的判断

---
 src/main/java/com/product/file/service/FileManagerService.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/product/file/service/FileManagerService.java b/src/main/java/com/product/file/service/FileManagerService.java
index 7a77f08..cd6e528 100644
--- a/src/main/java/com/product/file/service/FileManagerService.java
+++ b/src/main/java/com/product/file/service/FileManagerService.java
@@ -321,7 +321,7 @@
 		String uuids = "";
 		for (Map.Entry<Object, Object> entry : map.entrySet()) {
 			fieldFse = fieldMetaEntity.getFieldMeta(fieldName);
-			if (fieldFse == null || !CmnConst.ATTACHMENT_TYPE.equals(fieldFse.getString(CmnConst.FIELD_TYPE))) {
+			if (fieldFse == null || (!CmnConst.ATTACHMENT_TYPE.equals(fieldFse.getString(CmnConst.FIELD_TYPE)) && !"file-image".equals(fieldFse.getString(CmnConst.FIELD_TYPE)))) {
 				fse.setValue(entry.getKey().toString(), null);
 				continue;
 			}
@@ -419,7 +419,7 @@
 		}
 		return fse;
 	}
-	
+
 	/**
 	 * 	鏍规嵁闄勪欢琛ㄦ暟鎹敓鎴愭枃妗g储寮�
 	 */
@@ -427,17 +427,17 @@
 		// 閬嶅巻闄勪欢琛�
 		DataTableEntity dtAttachment = baseDao.listTable(CmnConst.PRODUCT_SYS_ATTACHMENTS);
 		if (BaseUtil.dataTableIsEmpty(dtAttachment)) {
-			return ;
+			return;
 		}
 		for (int i = 0; i < dtAttachment.getRows(); i++) {
 			// 鑾峰彇闄勪欢淇℃伅锛屽苟鍒ゆ柇鏄惁鏈夎〃鍜屽瓧娈�
 			FieldSetEntity fseAttachment = dtAttachment.getFieldSetEntity(i);
-			if(BaseUtil.strIsNull(fseAttachment.getString("attachment_data_field")) || BaseUtil.strIsNull(fseAttachment.getString("attachment_data_field"))) {
+			if (BaseUtil.strIsNull(fseAttachment.getString("attachment_data_field")) || BaseUtil.strIsNull(fseAttachment.getString("attachment_data_field"))) {
 				continue;
 			}
 			// 鏌ヨ鍘熸暟鎹紝鏈夊師鏁版嵁鍐嶇敓鎴愭枃妗f绱�
-			FieldSetEntity fseRecord = baseDao.getFieldSetEntityByFilter(fseAttachment.getString("attachment_data_table"), fseAttachment.getString("attachment_data_field") + " LIKE ?", new Object[] {"%"+fseAttachment.getUUID()+"%"}, false);
-			if(fseRecord != null) {
+			FieldSetEntity fseRecord = baseDao.getFieldSetEntityByFilter(fseAttachment.getString("attachment_data_table"), fseAttachment.getString("attachment_data_field") + " LIKE ?", new Object[]{"%" + fseAttachment.getUUID() + "%"}, false);
+			if (fseRecord != null) {
 				// 鐢熸垚鏂囨。妫�绱俊鎭�
 				FieldSetEntity fseIndex = new FieldSetEntity();
 				fseIndex.setTableName("fseIndex");

--
Gitblit v1.9.2