git-svn-id: https://192.168.57.71/svn/jsgkj@989 931142cf-59ea-a443-aa0e-51397b428577

gkoa/trunk/gkoa/src/com/xt/gkoa/common/webservices/WfWebService.java

@@ -252,6 +252,15 @@ public class WfWebService extends BaseWebCtl {
 					}
 				}
 			}
+			Collections.sort(users, new Comparator<User>() {
+				// 重写排序规则
+				public int compare(User o1, User o2) {
+					String a = o1.getSortno() + "";
+					String b = o2.getSortno() + "";
+					return a.compareTo(b);
+				}
+			});
+			
 			Queue<Org> orgQueue = new LinkedList<Org>();
 			List<String> orgIds = new ArrayList<String>();
 			if (users != null) {

gkoa/trunk/gkoa/src/com/xt/gkoa/wf/ctl/TaskCtl.java

@@ -386,6 +386,16 @@ public class TaskCtl extends BaseWebCtl {
 				}
 			}
 		}
+		
+		Collections.sort(users, new Comparator<User>() {
+			// 重写排序规则
+			public int compare(User o1, User o2) {
+				String a = o1.getSortno() + "";
+				String b = o2.getSortno() + "";
+				return a.compareTo(b);
+			}
+		});
+		
 		Queue<Org> orgQueue = new LinkedList<Org>();
 		List<Org> orglists = new ArrayList<Org>();
 		List<String> orgIds = new ArrayList<String>();
@@ -483,7 +493,7 @@ public class TaskCtl extends BaseWebCtl {
 		int i = 1;
 		int max = 4;
 		int orderStr = 0;
-		if ("fgldps".equals(stepEntity.getNextTaskKey()) || "fgldsh".equals(stepEntity.getNextTaskKey()) || stepEntity.getNextTaskKey().indexOf("fgld") > 0) {
+		if ("fgldps".equals(stepEntity.getNextTaskKey()) || "ldps".equals(stepEntity.getNextTaskKey())|| "fgldsh".equals(stepEntity.getNextTaskKey()) || stepEntity.getNextTaskKey().indexOf("fgld") > 0) {
 			max = 3;
 		}
 		while (userIt.hasNext()) {