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 3493c798..26e932e1 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
@@ -1778,7 +1778,7 @@ public class TodoTaskController extends BaseAction {
     private Double itemNumPro(String str){
         String temp="";
         Boolean flag=true;
-        if(str==null||str.isEmpty())return -1.0;
+        if(str==null||str.isEmpty())return Double.MAX_VALUE;
         for (int i = 0; i < str.length(); i++) {
             if(str.charAt(i)>='0'&&str.charAt(i)<='9'){
                 temp+=str.charAt(i);
@@ -1812,26 +1812,23 @@ public class TodoTaskController extends BaseAction {
         }
         //将所有mesg数据进行整合
         JSONArray jsonArray=new JSONArray();
-        JSONArray jsonArray1=new JSONArray();
         for (String id:idData) {
-            jsonArray1.addAll(msgData.get(id).getJSONArray("itemList"));
+            jsonArray.addAll(msgData.get(id).getJSONArray("itemList"));
         }
         //将mesg数据进行去重
-//        for (int i = 0; i < jsonArray.size()-1; i++) {
+//        for (int i = 0; i < jsonArray.size()-1; i++) { //双循环法
 //            for (int j = i+1; j < jsonArray.size(); j++) {
 //                if(jsonArray.get(i).equals(jsonArray.get(j))){
 //                    jsonArray.remove(j);
 //                }
 //            }
 //        }
-        //将mesg数据进行排序
-
-        Set set = new HashSet();
-        for(int i = 0 ; i<jsonArray1.size();i++){
-            set.add(jsonArray1.get(i));
+        Set set = new HashSet();//hashset法
+        for(int i = 0 ; i<jsonArray.size();i++){
+            set.add(jsonArray.get(i));
         }
-        JSONArray jsonArray = JSONArray.parseArray(set.toString());
-
+        jsonArray = JSONArray.parseArray(set.toString());
+        //将mesg数据进行排序
         boolean f=false;
         for (int i = 0; i < jsonArray.size()-1; i++) {
             for (int j = 0; j < jsonArray.size()-1-i; j++) {