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

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

@@ -252,15 +252,6 @@ 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) {
@@ -380,19 +371,6 @@ public class WfWebService extends BaseWebCtl {
 			attr1.put("leaf", "true");
 			vo1.setAttributes(attr1);
 			userNodes.add(vo1);
-			// 朱家宝
-			User user2 = securityMgr.userService().findById("402881e44e8a0bfe014e8a12addb0007");
-			NodeVo vo2 = new NodeVo();
-			vo2.setId(user2.getId());
-			vo2.setText(user2.getName());
-			vo2.setState("open");
-			if (ids != null && ids.indexOf(user2.getId()) != -1) {
-				vo2.setChecked(true);
-			}
-			Map<String, String> attr2 = new HashMap<String, String>();
-			attr2.put("leaf", "true");
-			vo2.setAttributes(attr2);
-			userNodes.add(vo2);
 		}
 		Collections.sort(userNodes);
 		return userNodes;
@@ -537,10 +515,9 @@ public class WfWebService extends BaseWebCtl {
 		List<NodeVo> userNodes = new ArrayList<NodeVo>();
 		Iterator<User> userIt = users.iterator();
 		int i = 1;
-		int max = 4;
-		int orderStr = 0;
+		int max = 3;
 		if ("fgldps".equals(stepEntity.getNextTaskKey()) || "fgldsh".equals(stepEntity.getNextTaskKey()) || stepEntity.getNextTaskKey().indexOf("fgld") > 0) {
-			max = 3;
+			max = 2;
 		}
 		while (userIt.hasNext()) {
 			User user = userIt.next();
@@ -553,10 +530,6 @@ public class WfWebService extends BaseWebCtl {
 					i++;
 				}
 				vo.setSortno(i);
-				if ("402881e44e86c26d014e86c9ae8c0008".equals(user.getId())) {
-					orderStr = i + 1;
-					i++;
-				}
 				if (ids != null && ids.indexOf(user.getId()) != -1) {
 					vo.setChecked(true);
 				}
@@ -578,7 +551,35 @@ public class WfWebService extends BaseWebCtl {
 			}
 		}
 		if ("40289e0e4bc53c54014bc5490fe00173".equals(org.getId())) {
-			// 李辉 特别处理
+			/*	User user = securityMgr.userService().findById("402881e44e8a0bfe014e8a10c4940001");
+			NodeVo vo = new NodeVo();
+			vo.setId(user.getId());
+			vo.setText(user.getName());
+			vo.setState("open");
+			// vo.setSortno(max);
+			if (ids != null && ids.indexOf(user.getId()) != -1) {
+				vo.setChecked(true);
+			}
+			Map<String, String> attr = new HashMap<String, String>();
+			attr.put("leaf", "true");
+			for (Map<String, String> map : todoList) {
+				if ((!tasknode.getLastTask()) && vo.getId().equals(map.get("assignee")) && !vo.getId().equals(SecUtils.getCurrUser().getId())) {
+					attr.put("disabled", "disabled");
+				}
+			}
+			for (Map<String, String> map : doneList) {
+				if (vo.getId().equals(map.get("assignee")) && !vo.getId().equals(SecUtils.getCurrUser().getId())) {
+					attr.put("remind", "remind");
+				}
+			}
+			vo.setAttributes(attr);
+			if ("402881e44e86c26d014e86c940550007".equals(userNodes.get(userNodes.size() - 1).getId())) {
+				NodeVo tempNodeVo = userNodes.get(userNodes.size() - 1);
+				userNodes.set(userNodes.size() - 1, vo);
+				userNodes.add(tempNodeVo);
+			}
+			// userNodes.add(vo);
+*/
 			User user1 = securityMgr.userService().findById("402881e44e8a0bfe014e8a10c4940001");
 			NodeVo vo1 = new NodeVo();
 			vo1.setId(user1.getId());
@@ -602,31 +603,6 @@ public class WfWebService extends BaseWebCtl {
 			}
 			vo1.setAttributes(attr1);
 			userNodes.add(vo1);
-
-			// 朱家宝 排序在董正军后面
-			User user2 = securityMgr.userService().findById("402881e44e8a0bfe014e8a12addb0007");
-			NodeVo vo2 = new NodeVo();
-			vo2.setId(user2.getId());
-			vo2.setText(user2.getName());
-			vo2.setState("open");
-			vo2.setSortno(orderStr);
-			if (ids != null && ids.indexOf(user2.getId()) != -1) {
-				vo2.setChecked(true);
-			}
-			Map<String, String> attr2 = new HashMap<String, String>();
-			attr2.put("leaf", "true");
-			for (Map<String, String> map : todoList) {
-				if ((!tasknode.getLastTask()) && vo2.getId().equals(map.get("assignee")) && !vo2.getId().equals(SecUtils.getCurrUser().getId())) {
-					attr2.put("disabled", "disabled");
-				}
-			}
-			for (Map<String, String> map : doneList) {
-				if (vo2.getId().equals(map.get("assignee")) && !vo2.getId().equals(SecUtils.getCurrUser().getId())) {
-					attr2.put("remind", "remind");
-				}
-			}
-			vo2.setAttributes(attr2);
-			userNodes.add(vo2);
 		}
 		Collections.sort(userNodes, new Comparator<NodeVo>() {
 			// 重写排序规则

gkoa/trunk/gkoa/src/com/xt/gkoa/fwgl/ctl/YbfwCtl.java

@@ -453,10 +453,6 @@ public class YbfwCtl extends BaseWebCtl {
 					i++;
 				}
 				vo.setSortno(i);
-				if("402881e44e86c26d014e86c9ae8c0008".equals(user.getId())){
-					max = i+1;
-					i++;
-				}
 				Map<String, String> attr = new HashMap<String, String>();
 				attr.put("leaf", "true");
 				
@@ -465,21 +461,6 @@ public class YbfwCtl extends BaseWebCtl {
 				i++;
 			}
 		}
-		
-		if ("40289e0e4bc53c54014bc5490fe00173".equals(org.getId())) {
-			
-			//朱家宝特殊处理(dongzhengju后)
-			User user1 = securityMgr.userService().findById("402881e44e8a0bfe014e8a12addb0007");
-			NodeVo vo1 = new NodeVo();
-			vo1.setId(user1.getId());
-			vo1.setText(user1.getName());
-			vo1.setState("open");
-			vo1.setSortno(max);
-			Map<String, String> attr1 = new HashMap<String, String>();
-			vo1.setAttributes(attr1);
-			userNodes.add(vo1);
-		}
-		
 		Collections.sort(userNodes, new Comparator<NodeVo>() {
 			// 重写排序规则
 			public int compare(NodeVo o1, NodeVo o2) {

gkoa/trunk/gkoa/src/com/xt/gkoa/jsta/ctl/DbjstaCtl.java

@@ -768,8 +768,8 @@ public class DbjstaCtl extends BaseWebCtl {
 			filename = "信函模版";
 			suc = "doc";
 		} else {
-			f = new File(request.getServletContext().getRealPath("/") + "//static//template//17.doc");
-			filename = "建议提案厅内会办件模板";
+			f = new File(request.getServletContext().getRealPath("/") + "//static//template//01.doc");
+			filename = "厅港口局发文模板（下行文、平行文）";
 			suc = "doc";
 		}
 		byte[] data = null;

gkoa/trunk/gkoa/src/com/xt/gkoa/userManage/ctr/UserManageCtl.java

@@ -389,29 +389,6 @@ public class UserManageCtl extends BaseWebCtl {
 		securityMgr.userService().save(u);
 		return wr;
 	}
-	
-	/**
-	 * 修改密码
-	 * 
-	 * @param oldPassword
-	 * @param newPassword
-	 * @return
-	 */
-	@RequestMapping(value = "/resetPwd")
-	@ResponseBody
-	public WebJsonResult resetPwd(@RequestParam(value = "id") String id) {
-		User u = securityMgr.userService().findById(id);
-		WebJsonResult wr = success();
-		if(u!= null){
-			SimpleHash hash = new SimpleHash(credentialsMatcher.getHashAlgorithmName(), "123456", null, credentialsMatcher.getHashIterations());
-			u.setPassword(hash.toHex());
-			securityMgr.userService().save(u);
-		}else{
-			wr.setMessage("用户不存在");
-			wr.setSuccess(false);
-		}
-		return wr;
-	}
 
 	/**
 	 * 一次性加载的用户授权菜单树

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

@@ -14,6 +14,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Queue;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.stereotype.Controller;
@@ -386,16 +389,6 @@ 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>();
@@ -491,10 +484,9 @@ public class TaskCtl extends BaseWebCtl {
 		List<NodeVo> userNodes = new ArrayList<NodeVo>();
 		Iterator<User> userIt = users.iterator();
 		int i = 1;
-		int max = 4;
-		int orderStr = 0;
-		if ("fgldps".equals(stepEntity.getNextTaskKey()) || "ldps".equals(stepEntity.getNextTaskKey())|| "fgldsh".equals(stepEntity.getNextTaskKey()) || stepEntity.getNextTaskKey().indexOf("fgld") > 0) {
-			max = 3;
+		int max = 3;
+		if ("fgldps".equals(stepEntity.getNextTaskKey()) || "fgldsh".equals(stepEntity.getNextTaskKey()) || stepEntity.getNextTaskKey().indexOf("fgld") > 0) {
+			max = 2;
 		}
 		while (userIt.hasNext()) {
 			User user = userIt.next();
@@ -507,10 +499,6 @@ public class TaskCtl extends BaseWebCtl {
 					i++;
 				}
 				vo.setSortno(i);
-				if ("402881e44e86c26d014e86c9ae8c0008".equals(user.getId())) {
-					orderStr = i + 1;
-					i++;
-				}
 				if (ids != null && ids.indexOf(user.getId()) != -1) {
 					vo.setChecked(true);
 				}
@@ -532,8 +520,35 @@ public class TaskCtl extends BaseWebCtl {
 			}
 		}
 		if ("40289e0e4bc53c54014bc5490fe00173".equals(org.getId())) {
-
-			// 李辉
+			/*	User user = securityMgr.userService().findById("402881e44e8a0bfe014e8a10c4940001");
+			NodeVo vo = new NodeVo();
+			vo.setId(user.getId());
+			vo.setText(user.getName());
+			vo.setState("open");
+			// vo.setSortno(max);
+			if (ids != null && ids.indexOf(user.getId()) != -1) {
+				vo.setChecked(true);
+			}
+			Map<String, String> attr = new HashMap<String, String>();
+			attr.put("leaf", "true");
+			for (Map<String, String> map : todoList) {
+				if ((!tasknode.getLastTask()) && vo.getId().equals(map.get("assignee")) && !vo.getId().equals(SecUtils.getCurrUser().getId())) {
+					attr.put("disabled", "disabled");
+				}
+			}
+			for (Map<String, String> map : doneList) {
+				if (vo.getId().equals(map.get("assignee")) && !vo.getId().equals(SecUtils.getCurrUser().getId())) {
+					attr.put("remind", "remind");
+				}
+			}
+			vo.setAttributes(attr);
+			if ("402881e44e86c26d014e86c940550007".equals(userNodes.get(userNodes.size() - 1).getId())) {
+				NodeVo tempNodeVo = userNodes.get(userNodes.size() - 1);
+				userNodes.set(userNodes.size() - 1, vo);
+				userNodes.add(tempNodeVo);
+			}
+			// userNodes.add(vo);
+*/
 			User user1 = securityMgr.userService().findById("402881e44e8a0bfe014e8a10c4940001");
 			NodeVo vo1 = new NodeVo();
 			vo1.setId(user1.getId());
@@ -557,31 +572,6 @@ public class TaskCtl extends BaseWebCtl {
 			}
 			vo1.setAttributes(attr1);
 			userNodes.add(vo1);
-
-			// 朱家宝 排序在董正军后面
-			User user2 = securityMgr.userService().findById("402881e44e8a0bfe014e8a12addb0007");
-			NodeVo vo2 = new NodeVo();
-			vo2.setId(user2.getId());
-			vo2.setText(user2.getName());
-			vo2.setState("open");
-			vo2.setSortno(orderStr);
-			if (ids != null && ids.indexOf(user2.getId()) != -1) {
-				vo2.setChecked(true);
-			}
-			Map<String, String> attr2 = new HashMap<String, String>();
-			attr2.put("leaf", "true");
-			for (Map<String, String> map : todoList) {
-				if ((!tasknode.getLastTask()) && vo2.getId().equals(map.get("assignee")) && !vo2.getId().equals(SecUtils.getCurrUser().getId())) {
-					attr2.put("disabled", "disabled");
-				}
-			}
-			for (Map<String, String> map : doneList) {
-				if (vo2.getId().equals(map.get("assignee")) && !vo2.getId().equals(SecUtils.getCurrUser().getId())) {
-					attr2.put("remind", "remind");
-				}
-			}
-			vo2.setAttributes(attr2);
-			userNodes.add(vo2);
 		}
 		Collections.sort(userNodes, new Comparator<NodeVo>() {
 			// 重写排序规则