From 8e6e56156911b7b7fcd9d63efbac9c98b3220190 Mon Sep 17 00:00:00 2001
From: dingbingqing <dingbingqing@syxysoft.com>
Date: Thu, 29 Dec 2022 16:59:21 +0800
Subject: [PATCH] =?UTF-8?q?/decodeDetail=E6=8E=A5=E5=8F=A3=E4=B8=AD?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=95=B0=E6=8D=AE=E5=8E=BB=E9=87=8D4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/TodoTaskController.java                  | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
index 26e932e1..7e08490f 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java
@@ -1796,24 +1796,21 @@ public class TodoTaskController extends BaseAction {
     @GetMapping("/decodeDetail")
     public BusProcessNew Detail(String taskIds, String pId) {
         QueryWrapper<BusProcessNew> q=new QueryWrapper<>();
-        Map<String,JSONObject> msgData =new HashMap<>();
-        List<String> idData=new ArrayList<>();
+        Set<JSONObject> msgData =new HashSet<>();
         List<BusProcessNew> listData = iBusProcessNewService.list(q.eq("P_ID", pId));
         //取出此任务中所有审核mesg数据
         for (BusProcessNew bpn:listData) {
             String mesg = bpn.getMesg();
             JSONObject object = JSONObject.parseObject(mesg);
             String resolveFlag = object.getString("resolveFlag");
-
             if(bpn.getTaskInfo().equals("审核")&&resolveFlag.equals("1")){
-                idData.add(bpn.getTaskId());
-                msgData.put(bpn.getTaskId(),object);
+                msgData.add(object);
             }
         }
         //将所有mesg数据进行整合
         JSONArray jsonArray=new JSONArray();
-        for (String id:idData) {
-            jsonArray.addAll(msgData.get(id).getJSONArray("itemList"));
+        for (JSONObject jo:msgData) {
+            jsonArray.addAll(jo.getJSONArray("itemList"));
         }
         //将mesg数据进行去重
 //        for (int i = 0; i < jsonArray.size()-1; i++) { //双循环法
@@ -1823,9 +1820,9 @@ public class TodoTaskController extends BaseAction {
 //                }
 //            }
 //        }
-        Set set = new HashSet();//hashset法
+        Set<JSONObject> set = new HashSet<>();//hashset法
         for(int i = 0 ; i<jsonArray.size();i++){
-            set.add(jsonArray.get(i));
+            set.add(jsonArray.getJSONObject(i));
         }
         jsonArray = JSONArray.parseArray(set.toString());
         //将mesg数据进行排序