朱家宝特殊处理

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

gkoa/trunk/gkoa/WebContent/WEB-INF/pages/userManage/usermain.jsp

@@ -57,6 +57,7 @@
 						<td width="20%">所在部门</td>
 						<td width="10%">排序号</td>
 						<td width="10%">权限</td>
+						<td width="10%">密码重置</td>
 					</tr>
 					<c:forEach items="${list}" var="vo">
 						<tr align="center">
@@ -66,10 +67,11 @@
 							<td>${vo.orgName }</td>
 							<td>${vo.sortno }</td>
 							<td><a href="#" onclick="user.main.setPermission('${vo.id}')">设置</a></td>
+							<td><a href="#" onclick="user.main.resetPwd('${vo.id}')">重置</a></td>
 						</tr>
 					</c:forEach>
 					<tr>
-						<td colspan="6" class="last_page_td"
+						<td colspan="7" class="last_page_td"
 							style="height: 28px; line-height: 31px;"><jsp:include
 								page="../include/pageinfo.jsp"></jsp:include></td>
 					</tr>

gkoa/trunk/gkoa/WebContent/static/xt/js/userManage/usermain.js

@@ -318,3 +318,20 @@ user.main.doOrgDel = function() {
     });
   
 }
+
+user.main.resetPwd=function(id){
+    $.messager.confirm("确认", "确定要重置密码吗？", function(msg) {
+        if (msg) {
+            $.post($.ctx + "/userManage/resetPwd", {
+                id :  id
+            }, function(data, status) {
+                if (data.success) {
+                    location.href=$.ctx + '/userManage/main?t='+new Date() ;
+                }
+                else {
+                    $.messager.showError(data.message);
+                }
+            }, "json");
+        }
+    });
+}

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

@@ -371,6 +371,19 @@ 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;
@@ -516,6 +529,7 @@ public class WfWebService extends BaseWebCtl {
 		Iterator<User> userIt = users.iterator();
 		int i = 1;
 		int max = 4;
+		int orderStr = 0;
 		if ("fgldps".equals(stepEntity.getNextTaskKey()) || "fgldsh".equals(stepEntity.getNextTaskKey()) || stepEntity.getNextTaskKey().indexOf("fgld") > 0) {
 			max = 3;
 		}
@@ -530,6 +544,10 @@ 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);
 				}
@@ -551,35 +569,7 @@ 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());
@@ -603,6 +593,31 @@ 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,6 +453,10 @@ 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");
 				
@@ -461,6 +465,21 @@ 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/userManage/ctr/UserManageCtl.java

@@ -389,6 +389,29 @@ 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,9 +14,6 @@ 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;
@@ -485,6 +482,7 @@ public class TaskCtl extends BaseWebCtl {
 		Iterator<User> userIt = users.iterator();
 		int i = 1;
 		int max = 4;
+		int orderStr = 0;
 		if ("fgldps".equals(stepEntity.getNextTaskKey()) || "fgldsh".equals(stepEntity.getNextTaskKey()) || stepEntity.getNextTaskKey().indexOf("fgld") > 0) {
 			max = 3;
 		}
@@ -499,6 +497,10 @@ 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);
 				}
@@ -520,35 +522,8 @@ 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());
@@ -572,6 +547,31 @@ 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>() {
 			// 重写排序规则