diff --git a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/ijob.java b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/ijob.java
index c6ebdef4..699ea249 100644
--- a/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/ijob.java
+++ b/com.actionsoft.apps.coe.pal.datamigration/src/com/actionsoft/apps/coe/pal/datamigration/ijob.java
@@ -121,7 +121,7 @@ public class ijob implements IJob {
         }*/
 
         List<String> list = new LinkedList<>();
-        for (String user_id:
+        /*for (String user_id:
         sendList) {
             System.out.println("user_id================"+user_id);
             List<BO> bo_eu_require_data = SDK.getBOAPI().query("BO_ACT_DATAID", true).addQuery("PROCESSID=", cc).addQuery("USER_ID=",user_id).list();
@@ -137,8 +137,8 @@ public class ijob implements IJob {
             }else {
                continue;
             }
-        }
-
+        }*/
+        list.add("10056870");
 
         System.out.println("新list>>>>>>"+list.size());
         System.out.println("剩余需要发送的人员清单>>>>>>>>>>>"+list.toString());
diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
index 4fa29b0c..99b4d9c3 100755
--- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
+++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
@@ -4109,6 +4109,24 @@ public class DesignerRelationShapeWeb extends ActionWeb {
         JSONArray filePathArray = new JSONArray(new LinkedList<>());
         //附件列表
         List<FormFile> formFiles = SDK.getBOAPI().getFiles(boId, "CONTENT");
+
+
+
+        Collections.sort(formFiles, new Comparator<FormFile>() {
+            @Override
+            public int compare(FormFile o1, FormFile o2) {
+                String p1 = o1.getFileName();
+                String p2 = o2.getFileName();
+
+                if ( p1.contains("、") && p2.contains("、") && StringUtils.isNumeric(p1.substring(0, p1.indexOf("、"))) && StringUtils.isNumeric(p2.substring(0, p2.indexOf("、")))) {
+                    return Integer.parseInt(p1.substring(0, p1.indexOf("、"))) - Integer.parseInt(p2.substring(0, p2.indexOf("、")));
+                } else {
+                    return 0;
+                }
+
+            }
+        });
+
         for (FormFile formFile : formFiles) {
             DCContext fileDCContext = SDK.getBOAPI().getFileDCContext(formFile);
             fileDCContext.setSession(_uc);
diff --git a/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java b/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java
index 35713815..de96cf34 100644
--- a/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java
+++ b/com.awspaas.user.apps.yili.reportform/src/com/awspaas/user/apps/yili/reportform/service/DataViewService.java
@@ -1077,8 +1077,8 @@ public class DataViewService extends ActionWeb {
 				"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
 						+ positionName + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%' OR POST in("+depaertName+") ");
 		List<RowMap> DepartnodeRowMaps = DBSql.getMaps(
-				"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE POST LIKE '%"
-						+ departName + "%' OR POST LIKE '%内蒙古伊利实业集团股份有限公司%' OR POST IN("+depaertName+") ");
+				"SELECT NODEID,NODENAME,NODETYPE,PLID,PLNAME,ACTIVITYNUMBER,ACTIVITYDESC,ROLE,ROLENAME,POST,POSTNAME FROM BO_EU_PAL_FILENODE6 WHERE " +
+						" POST LIKE '%内蒙古伊利实业集团股份有限公司%' OR POST IN("+depaertName+") ");
 		System.out.println("=========nodeRowMaps========>"+nodeRowMaps);
 		System.out.println("=========DepartnodeRowMaps========>"+DepartnodeRowMaps);
 		for (RowMap nodeRowMap : nodeRowMaps) {