更新

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/WelderServiceImpl.java

@@ -220,6 +220,8 @@ public class WelderServiceImpl {
 
     @BusinessIdentify
     public Page<Map<String, Object>> getWelderByProjectId(String projectId, int current, int size, String name, String type) {
+        String columnKey = "column";
+        String valueKey = "value";
         Page<Map<String, Object>> mapPage = new Page<>();
         ArrayList<Map<String, Object>> maps = new ArrayList<>();
         ReginParams reginParams = orgService.getReginParams();
@@ -240,14 +242,14 @@ public class WelderServiceImpl {
             map.put("sequenceNbr", item.getSequenceNbr());
             List<Map<String, Object>> message = alertFormValueServiceImpl.getMessageMapByInstanceId(String.valueOf(item.getSequenceNbr()));
             message.forEach(dataItem -> {
-                if (String.valueOf(dataItem.get("column")).equals("image") && !ObjectUtils.isEmpty(dataItem.get("column")) && !ObjectUtils.isEmpty(dataItem.get("value"))) {
-                    String value1 = String.valueOf(dataItem.get("value"));
+                if (String.valueOf(dataItem.get(columnKey)).equals("image") && !ObjectUtils.isEmpty(dataItem.get(columnKey)) && !ObjectUtils.isEmpty(dataItem.get(valueKey))) {
+                    String value1 = String.valueOf(dataItem.get(valueKey));
                     List<Map<String, Object>> imageMap = (List<Map<String, Object>>) JSON.parse(value1);
                     if (!ObjectUtils.isEmpty(imageMap)){
                         map.put("files", imageMap);
                     }
                 }
-                map.put(String.valueOf(dataItem.get("column")), dataItem.get("value"));
+                map.put(String.valueOf(dataItem.get(columnKey)), dataItem.get(valueKey));
             });
             maps.add(map);
         });