fix: NEZ-3089 修复资产批量修改属性时代码强转失败问题rel-23.07.04rel-23.07.03

3 files changed, 9 insertions, 21 deletions

diff --git a/nz-admin/src/main/java/com/nis/common/utils/Constant.java b/nz-admin/src/main/java/com/nis/common/utils/Constant.java
index a2a298e1..88b9829c 100644
--- a/nz-admin/src/main/java/com/nis/common/utils/Constant.java
+++ b/nz-admin/src/main/java/com/nis/common/utils/Constant.java
@@ -380,7 +380,7 @@ public class Constant {
 		ALERT_RULE_UNIT_MAP.put("YYYY-MM-DD HH:mm:ss", 34);
 		ALERT_RULE_UNIT_MAP.put("MM/DD/YYYY h:mm:ss a", 35);
 
-		ASSET_FIELD_META_VALUE = Arrays.asList(new String[] { "text", "multitext", "textarea", "radio", "checkbox",
+		ASSET_FIELD_META_VALUE = Arrays.asList(new String[] { "text", "textarea", "radio", "checkbox",
 				"select", "integer", "double", "datetime", "password", "email" });
 
 		ALERT_MESSAGE_TABLE_STATE_MAPPING.put(ALERT_MESSAGE_ACTIVE_TABLE, ALERT_MESSAGE_ACTIVE_STATE);
diff --git a/nz-admin/src/main/java/com/nis/common/utils/NzExpressionUtil.java b/nz-admin/src/main/java/com/nis/common/utils/NzExpressionUtil.java
index 5d8d828d..0e4d00c8 100644
--- a/nz-admin/src/main/java/com/nis/common/utils/NzExpressionUtil.java
+++ b/nz-admin/src/main/java/com/nis/common/utils/NzExpressionUtil.java
@@ -95,8 +95,8 @@ public class NzExpressionUtil {
 						// 用来取值的 metakey
 						String valueKey = Tool.StrUtil.isEmpty(key) ? expre : key;
 						String type = keyTypeMap.get(valueKey);
-						// 当类型为 MULTITEXT CHECKBOX 需要通过下标进行取值
-						if (Tool.StrUtil.equalsIgnoreCase("MULTITEXT", type) || Tool.StrUtil.equalsIgnoreCase("CHECKBOX", type) || Tool.StrUtil.equalsIgnoreCase("DATETIME", type)) {
+						// 当类型为 CHECKBOX DATETIME 需要通过下标进行取值
+						if (Tool.StrUtil.equalsIgnoreCase("CHECKBOX", type) || Tool.StrUtil.equalsIgnoreCase("DATETIME", type)) {
 							if (ToolUtil.isNotEmpty(map) && ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(index)) {
 								List<String> list = map.get(key);
 								if (ToolUtil.isNotEmpty(list)) {
@@ -148,8 +148,8 @@ public class NzExpressionUtil {
 						// 用来取值的 metakey
 						String valueKey = Tool.StrUtil.isEmpty(key) ? expre : key;
 						String type = keyTypeMap.get(valueKey);
-						// 当类型为 MULTITEXT CHECKBOX 需要通过下标进行取值
-						if (Tool.StrUtil.equalsIgnoreCase("MULTITEXT", type) || Tool.StrUtil.equalsIgnoreCase("CHECKBOX", type) || Tool.StrUtil.equalsIgnoreCase("DATETIME", type)) {
+						// 当类型为 CHECKBOX DATETIME 需要通过下标进行取值
+						if (Tool.StrUtil.equalsIgnoreCase("CHECKBOX", type) || Tool.StrUtil.equalsIgnoreCase("DATETIME", type)) {
 							if (ToolUtil.isNotEmpty(map) && ToolUtil.isNotEmpty(key) && ToolUtil.isNotEmpty(index)) {
 								List<String> list = map.get(key);
 								if (ToolUtil.isNotEmpty(list)) {
diff --git a/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetAssetServiceImpl.java b/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetAssetServiceImpl.java
index d0c76013..1b3caf4e 100644
--- a/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetAssetServiceImpl.java
+++ b/nz-admin/src/main/java/com/nis/modules/asset/service/impl/AssetAssetServiceImpl.java
@@ -2411,25 +2411,13 @@ public class AssetAssetServiceImpl extends ServiceImpl<AssetAssetDao, AssetAsset
                     Integer action = (Integer) map.get("action");
 
                     if (ToolUtil.equals(action, 0)) {
-                        //根据 meta type 判断 value 是否为多值
-                        String type = (String) map.get("type");
-                        if (Tool.StrUtil.equalsIgnoreCase("MULTITEXT", type) || Tool.StrUtil.equalsIgnoreCase("CHECKBOX", type)) {
-                            List<String> values = (List<String>) map.get("value");
-                            for (Integer id : ids) {
-                                for (String value : values) {
-                                    AssetFieldValue data = new AssetFieldValue();
-                                    data.setAssetId(id);
-                                    data.setMetaId((Integer) map.get("id"));
-                                    data.setValue(value);
-                                    addFields.add(data);
-                                }
-                            }
-                        }else {
-                            for (Integer id : ids) {
+                        List<String> values = (List<String>) map.get("value");
+                        for (Integer id : ids) {
+                            for (String value : values) {
                                 AssetFieldValue data = new AssetFieldValue();
                                 data.setAssetId(id);
                                 data.setMetaId((Integer) map.get("id"));
-                                data.setValue((String) map.get("value"));
+                                data.setValue(value);
                                 addFields.add(data);
                             }
                         }