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

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jgsq/ctl/JgsqCtl.java

@@ -93,19 +93,25 @@ public class JgsqCtl extends BaseWebCtl {
 	private XmbwglbService xmbwglbService;
 	@Autowired
 	private BwService bwService;
-	
+
 	/**
 	 * 一览
-	 * @param page 分页
+	 * 
+	 * @param page
+	 *            分页
 	 * @param model
 	 * @param request
-	 * @param xmmc 项目名称
-	 * @param szgkid 所在港口ID
-	 * @param szgqid 所在港区ID
+	 * @param xmmc
+	 *            项目名称
+	 * @param szgkid
+	 *            所在港口ID
+	 * @param szgqid
+	 *            所在港区ID
 	 * @param menuid
 	 * @param xmhzjbid
 	 * @param xmfr
-	 * @param szdid  所在地ID
+	 * @param szdid
+	 *            所在地ID
 	 * @param sfyzjbzid
 	 * @return
 	 * @throws JsonProcessingException
@@ -191,7 +197,7 @@ public class JgsqCtl extends BaseWebCtl {
 		};
 
 		if (page.getPage() < 1) {
-			
+
 			page.setPage(SearchCondition.jgsqpage);
 		}
 
@@ -208,6 +214,8 @@ public class JgsqCtl extends BaseWebCtl {
 					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JgsqEntity.PROCESS_DEFINITION_KEY);
 					if (info != null) {
 						vo.setCurrentname(info.getCurrName());
+					} else {
+						vo.setCurrentname("经办人受理");
 					}
 					List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), JgsqEntity.PROCESS_DEFINITION_KEY);
 					if (lists != null & lists.size() > 0) {
@@ -221,9 +229,17 @@ public class JgsqCtl extends BaseWebCtl {
 						}
 					} else {
 						if ("3".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("退回地市");
+							if ("N".equals(entity.getTbzt())) {
+								vo.setCurrentname("已退回地市待同步");
+							} else {
+								vo.setCurrentname("退回地市");
+							}
 						} else if ("4".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("完成且数据已同步");
+							if ("N".equals(entity.getTbzt())) {
+								vo.setCurrentname("已完成待同步");
+							} else {
+								vo.setCurrentname("已完成");
+							}
 						}
 					}
 				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
@@ -287,7 +303,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqmain";
 	}
 
-	//删除
+	// 删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
 	@RequiresPermissions("jgsq:delete")
@@ -304,7 +320,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//提交流程
+	// 提交流程
 	@RequestMapping(value = "/submit")
 	@ResponseBody
 	public WebJsonResult submit(Model model, JgsqEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -479,7 +495,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//退回后提交
+	// 退回后提交
 	@RequestMapping(value = "/submitAudit")
 	@ResponseBody
 	public WebJsonResult submitAudit(JgsqEntity code, String userids, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -576,7 +592,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//保存
+	// 保存
 	@RequestMapping(value = "/save")
 	@ResponseBody
 	public WebJsonResult save(Model model, JgsqEntity code, String sylxid, String ssjyrid, String fjids, String accid, String xmlxid, String tzlxid, String xmhzjbid, String axspjbid, String szdid, String szgkid, String szgqid, String zyhbwflid) {
@@ -751,6 +767,7 @@ public class JgsqCtl extends BaseWebCtl {
 
 	/**
 	 * 编辑
+	 * 
 	 * @param model
 	 * @param id
 	 * @param flag
@@ -891,7 +908,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqedit";
 	}
 
-	//获取泊位信息
+	// 获取泊位信息
 	public void getbwlist(Model model, String bwids) {
 		if (!StringUtils.isEmpty(bwids)) {
 			List<BwVo> slist = new ArrayList<BwVo>();
@@ -960,8 +977,8 @@ public class JgsqCtl extends BaseWebCtl {
 			model.addAttribute("bwlist", slist);
 		}
 	}
-	
-	//查看
+
+	// 查看
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
@@ -1028,7 +1045,7 @@ public class JgsqCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -1208,7 +1225,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqview";
 	}
 
-	//新增
+	// 新增
 	@RequestMapping(value = "/add")
 	@RequiresPermissions("jgsq:add")
 	public String add(Model model) {
@@ -1240,7 +1257,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return "gkjsgl/jgsq/jgsqadd";
 	}
 
-	//项目类型
+	// 项目类型
 	@RequestMapping(value = "/selectXmlx")
 	@ResponseBody
 	public List<CodeEntity> selectXmlx(Model model) {
@@ -1248,7 +1265,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return list;
 	}
 
-	//投资类型
+	// 投资类型
 	@RequestMapping(value = "/selectTzlx")
 	@ResponseBody
 	public List<CodeEntity> selectTzlx(Model model) {
@@ -1256,7 +1273,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return list;
 	}
 
-	//项目核准级别
+	// 项目核准级别
 	@RequestMapping(value = "/selectXmhzjb")
 	@ResponseBody
 	public List<CodeEntity> selectXmhzjb(Model model) {
@@ -1264,7 +1281,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return list;
 	}
 
-	//岸线审批级别
+	// 岸线审批级别
 	@RequestMapping(value = "/selectAxspjb")
 	@ResponseBody
 	public List<CodeEntity> selectAxspjb(Model model) {
@@ -1274,17 +1291,22 @@ public class JgsqCtl extends BaseWebCtl {
 
 	/**
 	 * 审核流程
-	 * @param shyj 审核意见
+	 * 
+	 * @param shyj
+	 *            审核意见
 	 * @param id
-	 * @param flag 同意true 不同意 false
-	 * @param accid 附件ID
-	 * @param userids 用户ID
+	 * @param flag
+	 *            同意true 不同意 false
+	 * @param accid
+	 *            附件ID
+	 * @param userids
+	 *            用户ID
 	 * @param fjzdids
 	 * @return
 	 */
 	@RequestMapping(value = "/audit")
 	@ResponseBody
-	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids,  String fjzdids) {
+	public WebJsonResult audit(String shyj, String id, boolean flag, String accid, String userids, String fjzdids) {
 		WebJsonResult wr = success();
 		JgsqEntity entity = jgsqService.findOne(id);
 		if (!StringUtils.isEmpty(accid)) {
@@ -1300,27 +1322,32 @@ public class JgsqCtl extends BaseWebCtl {
 
 			// 获取流程最新步骤
 			TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JgsqEntity.PROCESS_DEFINITION_KEY);
-			// 退回用户处理
-			if (!flag) {
-				List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JgsqEntity.PROCESS_DEFINITION_KEY);
-				for (int i = slist.size() - 1; i > 0; i--) {
-					TaskInfoEntity taskentity = slist.get(i);
-					if ("zjps".equals(taskentity.getTaskKey()) && taskentity.getState() == "2") {
-						userids = taskentity.getAuditUser() + ",";
+			boolean flowflag;
+			if (StringUtils.isEmpty(info)) {
+				flowflag = true;
+			} else {
+				// 退回用户处理
+				if (!flag) {
+					List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JgsqEntity.PROCESS_DEFINITION_KEY);
+					for (int i = slist.size() - 1; i > 0; i--) {
+						TaskInfoEntity taskentity = slist.get(i);
+						if ("zjps".equals(taskentity.getTaskKey()) && taskentity.getState() == "2") {
+							userids = taskentity.getAuditUser() + ",";
+						}
 					}
-				}
-				if ("kscs".equals(info.getTaskKey()) || "cnxk".equals(info.getTaskKey())) {
-					List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndTaskKey(id, info.getTaskKey());
-					if (lists != null && lists.size() > 0) {
-						for (TaskInfoEntity task : lists) {
-							task.setSfth(Constants.NO);
-							taskInfoService.save(task);
+					if ("kscs".equals(info.getTaskKey()) || "cnxk".equals(info.getTaskKey())) {
+						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndTaskKey(id, info.getTaskKey());
+						if (lists != null && lists.size() > 0) {
+							for (TaskInfoEntity task : lists) {
+								task.setSfth(Constants.NO);
+								taskInfoService.save(task);
+							}
 						}
 					}
 				}
+				flowflag = jgsqService.changeAudit(shyj, entity, flag, userids);
 			}
 
-			boolean flowflag = jgsqService.changeAudit(shyj, entity, flag, userids);
 			if (flowflag) {
 				if (flag) {
 					entity.setFlowstatus("4");
@@ -1332,16 +1359,16 @@ public class JgsqCtl extends BaseWebCtl {
 				// 如果是省级审核通过或不通过后同步到市级
 				try {
 					String url = "GK_OPERATION_JSJY_JGSQ_ONE_PC?condition=ID=" + entity.getId();
-					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
+					boolean tbflag = getTbStatus(url, entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						jgsqService.save(entity);
 					}
-
 				} catch (Exception e) {
+					entity.setTbzt("N");
+					jgsqService.save(entity);
 					e.printStackTrace();
 				}
-
 			} else {
 				// rtx提醒
 				if (!StringUtils.isEmpty(userids)) {
@@ -1387,13 +1414,13 @@ public class JgsqCtl extends BaseWebCtl {
 					String s = ssid.substring(0, 2);
 					// 去掉标志位查询
 					AccessoryEntity acc = accessoryService.findOne(ssid.substring(2, ssid.length()));
-					if(acc != null){
+					if (acc != null) {
 						acc.setSsid(xmxxgl.getId());
 						// 把备注设置成标识位+备注
 						acc.setRemark(s + acc.getRemark());
 						accessoryService.save(acc);
 					}
-					
+
 				}
 			}
 		}
@@ -1404,7 +1431,7 @@ public class JgsqCtl extends BaseWebCtl {
 	@ResponseBody
 	public WebJsonResult saveFile(MultipartFile filename, Model model) {
 		WebJsonResult wr = success();
-		if (filename != null && filename.getSize()>0) {
+		if (filename != null && filename.getSize() > 0) {
 			AccessoryEntity acc = accessoryService.saveFile(filename, "jgsq");
 			wr.setAttr("acc", acc);
 		} else {
@@ -1414,7 +1441,7 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//保存附件
+	// 保存附件
 	@RequestMapping(value = "/savefj")
 	@ResponseBody
 	public WebJsonResult savefj(Model model, JgsqfjEntity fjzd) {
@@ -1433,15 +1460,15 @@ public class JgsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//删除附件
+	// 删除附件
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {
 		AccessoryEntity acc = accessoryService.findOne(id);
-		if(acc != null ){
+		if (acc != null) {
 			accessoryService.delete(acc);
 		}
-		
+
 		WebJsonResult wr = success();
 		return wr;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdbg/ctl/JsjdbgCtl.java

@@ -211,10 +211,19 @@ public class JsjdbgCtl extends BaseWebCtl {
 			if (null != entity) {
 				BeanUtils.copyProperties(entity, vo);
 				if (entity.getRecordStatus() != 9) {
+
+					// 获取流程最新步骤
+					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JsjdbgEntity.PROCESS_DEFINITION_KEY);
+					if (info != null) {
+						vo.setCurrentname(info.getCurrName());
+					} else {
+						vo.setCurrentname("经办人受理");
+					}
+
 					List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), JsjdbgEntity.PROCESS_DEFINITION_KEY);
 					if (lists != null & lists.size() > 0) {
 						TaskInfoEntity taskinfo = lists.get(0);
-						vo.setCurrentname(taskinfo.getCurrName());
+						// vo.setCurrentname(taskinfo.getCurrName());
 						if ((jsjdbgService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) || jsjdbgService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) {
 							if ("受理经办人".equals(taskinfo.getCurrName())) {
 								vo.setTaskState("TH");
@@ -224,9 +233,17 @@ public class JsjdbgCtl extends BaseWebCtl {
 						}
 					} else {
 						if ("1".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("退回地市");
+							if ("N".equals(entity.getTbzt())) {
+								vo.setCurrentname("已退回地市待同步");
+							} else {
+								vo.setCurrentname("退回地市");
+							}
 						} else if ("2".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("完成");
+							if ("N".equals(entity.getTbzt())) {
+								vo.setCurrentname("已完成待同步");
+							} else {
+								vo.setCurrentname("已完成");
+							}
 						}
 					}
 				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
@@ -1249,27 +1266,33 @@ public class JsjdbgCtl extends BaseWebCtl {
 			}
 			// 获取流程最新步骤
 			TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JsjdbgEntity.PROCESS_DEFINITION_KEY);
-			// 退回用户处理
-			if (!flag) {
-				List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JsjdbgEntity.PROCESS_DEFINITION_KEY);
-				for (int i = slist.size() - 1; i > 0; i--) {
-					TaskInfoEntity taskentity = slist.get(i);
-					if ("zjps".equals(taskentity.getTaskKey()) && "2".equals(taskentity.getState())) {
-						userids = taskentity.getAuditUser() + ",";
+			boolean flowflag;
+			if (StringUtils.isEmpty(info)) {
+				flowflag = true;
+			} else {
+				// 退回用户处理
+				if (!flag) {
+					List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JsjdbgEntity.PROCESS_DEFINITION_KEY);
+					for (int i = slist.size() - 1; i > 0; i--) {
+						TaskInfoEntity taskentity = slist.get(i);
+						if ("zjps".equals(taskentity.getTaskKey()) && "2".equals(taskentity.getState())) {
+							userids = taskentity.getAuditUser() + ",";
+						}
 					}
-				}
-				if ("kscs".equals(info.getTaskKey()) || "cnxk".equals(info.getTaskKey())) {
-					List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndTaskKey(id, info.getTaskKey());
-					if (lists != null && lists.size() > 0) {
-						for (TaskInfoEntity task : lists) {
-							task.setSfth(Constants.NO);
-							taskInfoService.save(task);
+					if ("kscs".equals(info.getTaskKey()) || "cnxk".equals(info.getTaskKey())) {
+						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndTaskKey(id, info.getTaskKey());
+						if (lists != null && lists.size() > 0) {
+							for (TaskInfoEntity task : lists) {
+								task.setSfth(Constants.NO);
+								taskInfoService.save(task);
+							}
 						}
 					}
 				}
+
+				flowflag = jsjdbgService.changeAudit(shyj, entity, flag, userids);
 			}
 
-			boolean flowflag = jsjdbgService.changeAudit(shyj, entity, flag, userids);
 			if (flowflag) {
 				if (flag) {
 					entity.setFlowstatus("2");
@@ -1296,6 +1319,8 @@ public class JsjdbgCtl extends BaseWebCtl {
 						jsjdbgService.save(entity);
 					}
 				} catch (Exception e) {
+					entity.setTbzt("N");
+					jsjdbgService.save(entity);
 					e.printStackTrace();
 				}
 

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdcbsj/ctl/JsjdcbsjCtl.java

@@ -96,16 +96,22 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	/**
 	 * 一览
-	 * @param page 分页
+	 * 
+	 * @param page
+	 *            分页
 	 * @param model
 	 * @param request
-	 * @param xmmc 项目名称
-	 * @param szgkid 所在港口ID
-	 * @param szgqid 所在港区ID
+	 * @param xmmc
+	 *            项目名称
+	 * @param szgkid
+	 *            所在港口ID
+	 * @param szgqid
+	 *            所在港区ID
 	 * @param menuid
-	 * @param xmhzjbid 
+	 * @param xmhzjbid
 	 * @param xmfr
-	 * @param szdid 所在地ID
+	 * @param szdid
+	 *            所在地ID
 	 * @param sfyzjbzid
 	 * @return
 	 * @throws JsonProcessingException
@@ -205,6 +211,8 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
 					if (info != null) {
 						vo.setCurrentname(info.getCurrName());
+					} else {
+						vo.setCurrentname("经办人受理");
 					}
 					List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
 					if (lists != null & lists.size() > 0) {
@@ -219,9 +227,17 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 						}
 					} else {
 						if ("1".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("退回地市");
+							if ("N".equals(entity.getTbzt())) {
+								vo.setCurrentname("已退回地市待同步");
+							} else {
+								vo.setCurrentname("退回地市");
+							}
 						} else if ("2".equals(entity.getFlowstatus())) {
-							vo.setCurrentname("完成且数据已同步");
+							if ("N".equals(entity.getTbzt())) {
+								vo.setCurrentname("已完成待同步");
+							} else {
+								vo.setCurrentname("已完成");
+							}
 						}
 					}
 				} else if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
@@ -288,6 +304,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	/**
 	 * 删除
+	 * 
 	 * @param model
 	 * @param id
 	 * @return
@@ -310,9 +327,10 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	/**
 	 * 提交流程
+	 * 
 	 * @param model
 	 * @param code
-	 * @param sylxid 
+	 * @param sylxid
 	 * @param userids
 	 * @param ssjyrid
 	 * @param fjids
@@ -500,6 +518,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	/**
 	 * 退回提交流程
+	 * 
 	 * @param code
 	 * @param userids
 	 * @param sylxid
@@ -613,6 +632,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	/**
 	 * 保存数据
+	 * 
 	 * @param model
 	 * @param code
 	 * @param ssjyrid
@@ -815,7 +835,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 	 * wr.setMessage("同步失败"); } return wr; }
 	 */
 
-	//编辑
+	// 编辑
 	@RequestMapping(value = "/edit")
 	@RequiresPermissions("jsjdcbsj:edit")
 	public String edit(Model model, String id, String flag) {
@@ -864,7 +884,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -947,7 +967,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjedit";
 	}
 
-	//获取泊位数据
+	// 获取泊位数据
 	public void getbwlist(Model model, String bwids) {
 		if (!StringUtils.isEmpty(bwids)) {
 			List<BwVo> slist = new ArrayList<BwVo>();
@@ -1017,7 +1037,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		}
 	}
 
-	//查看
+	// 查看
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
 		model.addAttribute("flag", flag);
@@ -1085,7 +1105,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				fjnamevo.setXhbz(accessoryList.get(i).getRemark().substring(2, accessoryList.get(i).getRemark().length()));
 				fjnamevo.setFjid(accid);
 				fjnamevo.setFjmc(accessoryList.get(i).getName());
-				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY)  && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+				if (GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
 					try {
 						Ftp f = getftp();
 						// 本地目录
@@ -1259,7 +1279,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjview";
 	}
 
-	//新增
+	// 新增
 	@RequestMapping(value = "/add")
 	@RequiresPermissions("jsjdcbsj:add")
 	public String add(Model model) {
@@ -1291,7 +1311,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return "gkjsgl/jsjdcbsj/jsjdcbsjadd";
 	}
 
-	//选择项目类型
+	// 选择项目类型
 	@RequestMapping(value = "/selectXmlx")
 	@ResponseBody
 	public List<CodeEntity> selectXmlx(Model model) {
@@ -1299,7 +1319,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return list;
 	}
 
-	//投资类型
+	// 投资类型
 	@RequestMapping(value = "/selectTzlx")
 	@ResponseBody
 	public List<CodeEntity> selectTzlx(Model model) {
@@ -1307,7 +1327,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return list;
 	}
 
-	//项目核准级别
+	// 项目核准级别
 	@RequestMapping(value = "/selectXmhzjb")
 	@ResponseBody
 	public List<CodeEntity> selectXmhzjb(Model model) {
@@ -1315,7 +1335,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return list;
 	}
 
-	//岸线审批级别
+	// 岸线审批级别
 	@RequestMapping(value = "/selectAxspjb")
 	@ResponseBody
 	public List<CodeEntity> selectAxspjb(Model model) {
@@ -1325,12 +1345,19 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 	/**
 	 * 审核流程
-	 * @param shyj 审核意见
-	 * @param id 主键ID
-	 * @param flag 同意true 不同意 false
-	 * @param accids 附件ID
-	 * @param userids 人员ID
-	 * @param fjzdids 其他附件ID
+	 * 
+	 * @param shyj
+	 *            审核意见
+	 * @param id
+	 *            主键ID
+	 * @param flag
+	 *            同意true 不同意 false
+	 * @param accids
+	 *            附件ID
+	 * @param userids
+	 *            人员ID
+	 * @param fjzdids
+	 *            其他附件ID
 	 * @return
 	 */
 	@RequestMapping(value = "/audit")
@@ -1350,27 +1377,35 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 
 			// 获取流程最新步骤
 			TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
-			// 退回用户处理
-			if (!flag) {
-				List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
-				for (int i = slist.size() - 1; i > 0; i--) {
-					TaskInfoEntity taskentity = slist.get(i);
-					if ("zjps".equals(taskentity.getTaskKey()) && "2".equals(taskentity.getState())) {
-						userids = taskentity.getAuditUser() + ",";
+			boolean flowflag;
+			if (StringUtils.isEmpty(info)) {
+				flowflag = true;
+			} else {
+				// 退回用户处理
+				if (!flag) {
+					List<TaskInfoEntity> slist = taskInfoService.findByBusIdAndBusKeyOrderByIdAsc(id, JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
+					for (int i = slist.size() - 1; i > 0; i--) {
+						TaskInfoEntity taskentity = slist.get(i);
+						if ("zjps".equals(taskentity.getTaskKey()) && "2".equals(taskentity.getState())) {
+							userids = taskentity.getAuditUser() + ",";
+						}
 					}
-				}
-				if ("kscs".equals(info.getTaskKey()) || "cnxk".equals(info.getTaskKey())) {
-					List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndTaskKey(id, info.getTaskKey());
-					if (lists != null && lists.size() > 0) {
-						for (TaskInfoEntity task : lists) {
-							task.setSfth(Constants.NO);
-							taskInfoService.save(task);
+					if ("kscs".equals(info.getTaskKey()) || "cnxk".equals(info.getTaskKey())) {
+						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndTaskKey(id, info.getTaskKey());
+						if (lists != null && lists.size() > 0) {
+							for (TaskInfoEntity task : lists) {
+								task.setSfth(Constants.NO);
+								taskInfoService.save(task);
+							}
 						}
 					}
 				}
+				flowflag = jsjdcbsjService.changeAudit(shyj, entity, flag, userids);
+				System.out.println("--------------------------------------");
+				System.out.println(info.getCurrName() + flowflag);
+				System.out.println("--------------------------------------");
 			}
 
-			boolean flowflag = jsjdcbsjService.changeAudit(shyj, entity, flag, userids);
 			if (flowflag) {
 				if (flag) {// 流程完成状态 2.审核通过1.退回地市
 					entity.setFlowstatus("2");
@@ -1382,12 +1417,14 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				// 如果是省级审核通过或不通过后同步到市级
 				try {
 					String url = "GK_OPERATION_JSJY_JSJDCBSJ_ONE_PC?condition=ID=" + entity.getId();
-					boolean tbflag = getTbStatus(url,entity.getSzd().getId());
+					boolean tbflag = getTbStatus(url, entity.getSzd().getId());
 					if (tbflag) {
 						entity.setTbzt("Y");
 						jsjdcbsjService.save(entity);
 					}
 				} catch (Exception e) {
+					entity.setTbzt("N");
+					jsjdcbsjService.save(entity);
 					e.printStackTrace();
 				}
 
@@ -1460,7 +1497,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//保存其他附件
+	// 保存其他附件
 	@RequestMapping(value = "/savefj")
 	@ResponseBody
 	public WebJsonResult savefj(Model model, JsjdcbsjfjEntity fjzd) {
@@ -1479,7 +1516,7 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	//删除附件
+	// 删除附件
 	@RequestMapping(value = "/delFile")
 	@ResponseBody
 	public WebJsonResult delFile(String id, Model model) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/cghzyxxgl/dcsb/webservice/DcsbWebService.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.util.StringUtils;
 
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.common.Utils;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
@@ -59,7 +60,7 @@ public class DcsbWebService extends BaseWebCtl {
 
 	public boolean queryUser(String userCode, String pwd) {
 		pwd = SHA256Encrypt(pwd);
-		UserEntity user = securityMgr.userService().findByUname(userCode);
+		UserEntity user = securityMgr.userService().findByUnameszd(userCode,GlobalData.CITY_CODE);
 		if (user != null) {
 			if (pwd.equals(user.getPassword())) {
 				return true;
@@ -362,7 +363,7 @@ public class DcsbWebService extends BaseWebCtl {
 	 * @return
 	 */
 	public UserEntity findUserByName(String userName) {
-		UserEntity ue = securityMgr.userService().findByUname(userName);
+		UserEntity ue = securityMgr.userService().findByUnameszd(userName,GlobalData.CITY_CODE);
 		return ue;
 	}
 

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/ctl/XkzbgCtl.java

@@ -284,6 +284,11 @@ public class XkzbgCtl extends BaseWebCtl {
 			if (entity != null) {
 				BeanUtils.copyProperties(entity, vo);
 				if (entity.getRecordStatus() != 9) {
+					// 获取流程最新步骤
+					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), XkzbgEntity.PROCESS_DEFINITION_KEY);
+					if (info != null) {
+						vo.setCurrentname(info.getCurrName());
+					}
 					if ((xkzbgService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) || xkzbgService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) {
 						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzbgEntity.PROCESS_DEFINITION_KEY);
 						if (lists != null & lists.size() > 0) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkbg/vo/XkzbgVo.java

@@ -6,8 +6,7 @@ import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
 import com.xtframe.sec.common.BaseVo;
 
-
-public class XkzbgVo extends BaseVo{
+public class XkzbgVo extends BaseVo {
 
 	private String id = null;
 	// 经营人ID
@@ -18,7 +17,7 @@ public class XkzbgVo extends BaseVo{
 	private GkEntity szgk = null;
 
 	private GqEntity szgq = null;
-	//许可证编号
+	// 许可证编号
 	private String xkzbh = null;
 	// 联系人
 	private String lxr = null;
@@ -29,21 +28,21 @@ public class XkzbgVo extends BaseVo{
 
 	private String yqymc = null;
 	private String xqymc = null;
-	
+
 	private String ybgdz = null;
 	private String xbgdz = null;
-	
-	private String yfddbr= null;
+
+	private String yfddbr = null;
 	private String xfddbr = null;
-	
+
 	private String yjydy = null;
 	private String xjydy = null;
-	
-	private String ysjjyfw =null;
+
+	private String ysjjyfw = null;
 	private String xsjjyfw = null;
-	
+
 	private String fj = null;
-	
+
 	// 申请人
 	private String sqr = null;
 	// 申请意见
@@ -77,229 +76,310 @@ public class XkzbgVo extends BaseVo{
 	private String spry = null;
 	private String taskState = null;
 	private String opflag = null;
-	
+	private String currentname;/* 流程节点名 */
+
+	public String getCurrentname() {
+		return currentname;
+	}
+
+	public void setCurrentname(String currentname) {
+		this.currentname = currentname;
+	}
+
 	public String getOpflag() {
 		return opflag;
 	}
+
 	public void setOpflag(String opflag) {
 		this.opflag = opflag;
 	}
+
 	public String getTaskState() {
 		return taskState;
 	}
+
 	public void setTaskState(String taskState) {
 		this.taskState = taskState;
 	}
+
 	public String getId() {
 		return id;
 	}
+
 	public void setId(String id) {
 		this.id = id;
 	}
+
 	public String getJyrid() {
 		return jyrid;
 	}
+
 	public void setJyrid(String jyrid) {
 		this.jyrid = jyrid;
 	}
+
 	public String getJyrmc() {
 		return jyrmc;
 	}
+
 	public void setJyrmc(String jyrmc) {
 		this.jyrmc = jyrmc;
 	}
+
 	public GkEntity getSzgk() {
 		return szgk;
 	}
+
 	public void setSzgk(GkEntity szgk) {
 		this.szgk = szgk;
 	}
+
 	public GqEntity getSzgq() {
 		return szgq;
 	}
+
 	public void setSzgq(GqEntity szgq) {
 		this.szgq = szgq;
 	}
+
 	public String getXkzbh() {
 		return xkzbh;
 	}
+
 	public void setXkzbh(String xkzbh) {
 		this.xkzbh = xkzbh;
 	}
+
 	public String getLxr() {
 		return lxr;
 	}
+
 	public void setLxr(String lxr) {
 		this.lxr = lxr;
 	}
+
 	public String getDh() {
 		return dh;
 	}
+
 	public void setDh(String dh) {
 		this.dh = dh;
 	}
+
 	public String getCz() {
 		return cz;
 	}
+
 	public void setCz(String cz) {
 		this.cz = cz;
 	}
+
 	public String getYqymc() {
 		return yqymc;
 	}
+
 	public void setYqymc(String yqymc) {
 		this.yqymc = yqymc;
 	}
+
 	public String getXqymc() {
 		return xqymc;
 	}
+
 	public void setXqymc(String xqymc) {
 		this.xqymc = xqymc;
 	}
+
 	public String getYbgdz() {
 		return ybgdz;
 	}
+
 	public void setYbgdz(String ybgdz) {
 		this.ybgdz = ybgdz;
 	}
+
 	public String getXbgdz() {
 		return xbgdz;
 	}
+
 	public void setXbgdz(String xbgdz) {
 		this.xbgdz = xbgdz;
 	}
+
 	public String getYfddbr() {
 		return yfddbr;
 	}
+
 	public void setYfddbr(String yfddbr) {
 		this.yfddbr = yfddbr;
 	}
+
 	public String getXfddbr() {
 		return xfddbr;
 	}
+
 	public void setXfddbr(String xfddbr) {
 		this.xfddbr = xfddbr;
 	}
+
 	public String getYjydy() {
 		return yjydy;
 	}
+
 	public void setYjydy(String yjydy) {
 		this.yjydy = yjydy;
 	}
+
 	public String getXjydy() {
 		return xjydy;
 	}
+
 	public void setXjydy(String xjydy) {
 		this.xjydy = xjydy;
 	}
+
 	public String getYsjjyfw() {
 		return ysjjyfw;
 	}
+
 	public void setYsjjyfw(String ysjjyfw) {
 		this.ysjjyfw = ysjjyfw;
 	}
+
 	public String getXsjjyfw() {
 		return xsjjyfw;
 	}
+
 	public void setXsjjyfw(String xsjjyfw) {
 		this.xsjjyfw = xsjjyfw;
 	}
+
 	public String getFj() {
 		return fj;
 	}
+
 	public void setFj(String fj) {
 		this.fj = fj;
 	}
+
 	public String getSqr() {
 		return sqr;
 	}
+
 	public void setSqr(String sqr) {
 		this.sqr = sqr;
 	}
+
 	public String getSqyj() {
 		return sqyj;
 	}
+
 	public void setSqyj(String sqyj) {
 		this.sqyj = sqyj;
 	}
+
 	public Date getSqrq() {
 		return sqrq;
 	}
+
 	public void setSqrq(Date sqrq) {
 		this.sqrq = sqrq;
 	}
+
 	public String getClscjbr() {
 		return clscjbr;
 	}
+
 	public void setClscjbr(String clscjbr) {
 		this.clscjbr = clscjbr;
 	}
+
 	public String getClscyj() {
 		return clscyj;
 	}
+
 	public void setClscyj(String clscyj) {
 		this.clscyj = clscyj;
 	}
+
 	public Date getClscrq() {
 		return clscrq;
 	}
+
 	public void setClscrq(Date clscrq) {
 		this.clscrq = clscrq;
 	}
+
 	public String getHcyj() {
 		return hcyj;
 	}
+
 	public void setHcyj(String hcyj) {
 		this.hcyj = hcyj;
 	}
+
 	public String getHcjbr() {
 		return hcjbr;
 	}
+
 	public void setHcjbr(String hcjbr) {
 		this.hcjbr = hcjbr;
 	}
+
 	public Date getHcrq() {
 		return hcrq;
 	}
+
 	public void setHcrq(Date hcrq) {
 		this.hcrq = hcrq;
 	}
+
 	public String getFhyj() {
 		return fhyj;
 	}
+
 	public void setFhyj(String fhyj) {
 		this.fhyj = fhyj;
 	}
+
 	public String getFhjbr() {
 		return fhjbr;
 	}
+
 	public void setFhjbr(String fhjbr) {
 		this.fhjbr = fhjbr;
 	}
+
 	public Date getFhrq() {
 		return fhrq;
 	}
+
 	public void setFhrq(Date fhrq) {
 		this.fhrq = fhrq;
 	}
+
 	public Date getSprq() {
 		return sprq;
 	}
+
 	public void setSprq(Date sprq) {
 		this.sprq = sprq;
 	}
+
 	public String getSpyj() {
 		return spyj;
 	}
+
 	public void setSpyj(String spyj) {
 		this.spyj = spyj;
 	}
+
 	public String getSpry() {
 		return spry;
 	}
+
 	public void setSpry(String spry) {
 		this.spry = spry;
 	}
-	
 
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/ctl/XkzsqCtl.java

@@ -49,6 +49,7 @@ import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.entity.XzglbmxxEntity;
 import com.xt.jygl.gkjcxx.xzdwxxgl.xzglbmxx.service.XzglbmxxService;
 import com.xt.jygl.gkjcxx.zyq.entity.ZyqEntity;
 import com.xt.jygl.gkjcxx.zyq.service.ZyqService;
+import com.xt.jygl.gkjsgl.jsjdbg.entity.JsjdbgEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrbw.service.BwService;
 import com.xt.jygl.gkjygl.gkjyr.jyrcg.entity.CgEntity;
 import com.xt.jygl.gkjygl.gkjyr.jyrcg.service.CgService;
@@ -168,17 +169,26 @@ public class XkzsqCtl extends BaseWebCtl {
 
 	/**
 	 * 一览查询
-	 * @param page 页数
-	 * @param model 
+	 * 
+	 * @param page
+	 *            页数
+	 * @param model
 	 * @param request
-	 * @param lczt 流程状态
-	 * @param szdid 所在地Id
-	 * @param szgkid 所在港口ID
-	 * @param szgqid 所在港区ID
-	 * @param gkjyr 所属经营人
-	 * @param fddbr 法定代表人
-	 * @param bgdd 办公地址
-	 * @param menuid 
+	 * @param lczt
+	 *            流程状态
+	 * @param szdid
+	 *            所在地Id
+	 * @param szgkid
+	 *            所在港口ID
+	 * @param szgqid
+	 *            所在港区ID
+	 * @param gkjyr
+	 *            所属经营人
+	 * @param fddbr
+	 *            法定代表人
+	 * @param bgdd
+	 *            办公地址
+	 * @param menuid
 	 * @return
 	 * @throws JsonProcessingException
 	 */
@@ -206,7 +216,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("szd").get("id").as(String.class), "%" + v + "%"));
 					}
 				}
-			
+
 				if (StringUtils.isNotEmpty(szgkid)) {
 					list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + szgkid + "%"));
 				} else if (isGET(request)) {
@@ -215,7 +225,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("szgk").get("id").as(String.class), "%" + v + "%"));
 					}
 				}
-			
+
 				if (StringUtils.isNotEmpty(szgqid)) {
 					list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + szgqid + "%"));
 				} else if (isGET(request)) {
@@ -224,7 +234,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("szgq").get("id").as(String.class), "%" + v + "%"));
 					}
 				}
-				
+
 				if (StringUtils.isNotEmpty(gkjyr)) {
 					list.add(cb.like(root.get("jyrmc").as(String.class), "%" + gkjyr + "%"));
 				} else if (isGET(request)) {
@@ -233,7 +243,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("jyrmc").as(String.class), "%" + v + "%"));
 					}
 				}
-				
+
 				if (StringUtils.isNotEmpty(fddbr)) {
 					list.add(cb.like(root.get("fddbr").as(String.class), "%" + fddbr + "%"));
 				} else if (isGET(request)) {
@@ -242,7 +252,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("fddbr").as(String.class), "%" + v + "%"));
 					}
 				}
-				
+
 				if (StringUtils.isNotEmpty(bgdd)) {
 					list.add(cb.like(root.get("bgdd").as(String.class), "%" + bgdd + "%"));
 				} else if (isGET(request)) {
@@ -251,7 +261,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						list.add(cb.like(root.get("bgdd").as(String.class), "%" + v + "%"));
 					}
 				}
-				
+
 				// 经营人只能查看自己企业下的数据，非经营人只能查看自己所在地的数据
 				if (isJyr()) {
 					list.add(cb.like(root.get("jyrid").as(String.class), "%" + getSsjyr().getId() + "%"));
@@ -264,7 +274,7 @@ public class XkzsqCtl extends BaseWebCtl {
 						}
 						list.add(in);
 					}
-				
+
 				}
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORD_STATE_DELETE));
 				list.add(cb.notEqual(root.get("recordStatus").as(Integer.class), BaseEntity.RECORE_STATE_COPY));
@@ -291,13 +301,14 @@ public class XkzsqCtl extends BaseWebCtl {
 		if (page.getPage() < 1) {
 			page.setPage(SearchCondition.xkzsqpage);
 		}
-		/*if (page.getPage() < 1) {
-			Object xkzsqpage = CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzsqpage");
-			if (StringUtils.isEmpty(xkzsqpage) || !org.apache.commons.lang.StringUtils.isNumeric(String.valueOf(xkzsqpage))) {
-				xkzsqpage = "1";
-			}
-			page.setPage(Integer.valueOf(String.valueOf(xkzsqpage)));
-		}*/
+		/*
+		 * if (page.getPage() < 1) { Object xkzsqpage =
+		 * CacheSearchCondition.cacheSCmapVal(cacheSCmap, "xkzsqpage"); if
+		 * (StringUtils.isEmpty(xkzsqpage) ||
+		 * !org.apache.commons.lang.StringUtils
+		 * .isNumeric(String.valueOf(xkzsqpage))) { xkzsqpage = "1"; }
+		 * page.setPage(Integer.valueOf(String.valueOf(xkzsqpage))); }
+		 */
 		page.setSort("id");
 		page.setOrder("desc");
 		Page<XkzsqEntity> list = query.findAll(spec, toPageRequest(page), XkzsqEntity.class);
@@ -307,6 +318,11 @@ public class XkzsqCtl extends BaseWebCtl {
 			if (entity != null) {
 				BeanUtils.copyProperties(entity, vo);
 				if (entity.getRecordStatus() != 9) {
+					// 获取流程最新步骤
+					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), XkzsqEntity.PROCESS_DEFINITION_KEY);
+					if (info != null) {
+						vo.setCurrentname(info.getCurrName());
+					}
 					if ((xkzsqService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) || xkzsqService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) {
 						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzsqEntity.PROCESS_DEFINITION_KEY);
 						if (lists != null & lists.size() > 0) {
@@ -318,20 +334,23 @@ public class XkzsqCtl extends BaseWebCtl {
 							}
 						}
 					}
-					if(!isJyr()){
+					if (!isJyr()) {
 						XkzxxEntity xkz = xkzxxService.findByOpid(entity.getId(), "11");
 						if (xkz != null) {
 							vo.setOpflag("1");
 						}
 					}
+					if (entity.getRecordStatus() == BaseEntity.RECORD_STATE_COMPLETED) {
+						vo.setCurrentname("完成");
+					}
 					voList.add(vo);
 				}
 			}
 		}
-		
+
 		if (isPOST(request)) {
 			SearchCondition.xkzsqpage = page.getPage();
-			//cacheSCmap.put("xkzsqpage", page.getPage());
+			// cacheSCmap.put("xkzsqpage", page.getPage());
 			CacheSearchCondition.putCacheSCmap(request.getParameterMap(), cacheSCmap);
 		}
 
@@ -349,7 +368,6 @@ public class XkzsqCtl extends BaseWebCtl {
 		return "gkjygl/gkjyxkgl/gkjyxksq/xkzsqmain";
 	}
 
-	
 	// 删除
 	@RequestMapping(value = "/delete")
 	@ResponseBody
@@ -359,9 +377,9 @@ public class XkzsqCtl extends BaseWebCtl {
 		try {
 			// 逻辑删除
 			xkzsqService.logicDelete(id);
-			//获取经营人信息
+			// 获取经营人信息
 			XkzsqEntity entity = xkzsqService.findOne(id);
-			//得到经营人信息，改状态
+			// 得到经营人信息，改状态
 			GkjyrEntity gkjyr = gkjyrService.findOne(entity.getJyrid());
 			gkjyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
 			gkjyrService.save(gkjyr);
@@ -380,7 +398,7 @@ public class XkzsqCtl extends BaseWebCtl {
 		GkjyrEntity jyr = new GkjyrEntity();
 		if (user.getSsjyr() != null) {
 			jyr = gkjyrService.findOne(user.getSsjyr().getId());
-			
+
 		}
 		model.addAttribute("jyr", jyr);
 		model.addAttribute("sqr", user.getName());
@@ -437,7 +455,7 @@ public class XkzsqCtl extends BaseWebCtl {
 							vo.setSsgqzw(gq.getGqmc());
 						}
 					}
-					//获取经营人名称
+					// 获取经营人名称
 					if (vo.getGkjyr() != null) {
 						GkjyrEntity jyr = gkjyrService.findOne(vo.getGkjyr());
 						if (null != jyr) {
@@ -509,10 +527,10 @@ public class XkzsqCtl extends BaseWebCtl {
 				gkjyrVo.setParentJyrIdzw(p.getGkjyr());
 			}
 		}
-		//获取许可证信息，经营人页面显示
+		// 获取许可证信息，经营人页面显示
 		List<XkzxxEntity> xkzs = xkzxxService.findByJyrid(gkjyr.getId());
 		for (XkzxxEntity xkz : xkzs) {
-			//判断许可证是否有效，并存在
+			// 判断许可证是否有效，并存在
 			if (BaseEntity.RECORD_STATE_VALID == xkz.getRecordStatus() && Constants.XKZ_SX.equals(xkz.getSfyx())) {
 				gkjyrVo.setXkzyxq(xkz.getYxqz());
 				gkjyrVo.setXkzyxqfmt(DateTime.toString(xkz.getYxqz()));
@@ -523,7 +541,7 @@ public class XkzsqCtl extends BaseWebCtl {
 				gkjyrVo.setJyqy(xkz.getCq());
 			}
 		}
-		//获取各个字典的中文
+		// 获取各个字典的中文
 		gkjyrVo.setSfwhqyzw(null != gkjyr.getSfwhqy() ? gkjyr.getSfwhqy().getText() : "");
 		gkjyrVo.setSfzdsp(null != gkjyr.getSfzdsp() ? gkjyr.getSfzdsp().getText() : "");
 		gkjyrVo.setYwcqzmzw(null != gkjyr.getYwcqzm() ? gkjyr.getYwcqzm().getText() : "");
@@ -548,7 +566,7 @@ public class XkzsqCtl extends BaseWebCtl {
 		Date today = new Date();
 		model.addAttribute("sj", dateTimeFormat.format(today));
 		XkzsqEntity xkzsq = xkzsqService.findOne(id);
-		//获取当前流程状态
+		// 获取当前流程状态
 		List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(id, XkzsqEntity.PROCESS_DEFINITION_KEY);
 		if (lists != null & lists.size() > 0) {
 			TaskInfoEntity taskinfo = lists.get(0);
@@ -617,7 +635,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			}
 			model.addAttribute("jyfwstr", jyfwstr);
 			model.addAttribute("jylzstr", jylzstr);
-			//获取各个附件的中文名称
+			// 获取各个附件的中文名称
 			List<Integer> list = fjlist(jyfwids);
 			if (list.size() > 0 && list != null) {
 				List<XkzsqzscsEntity> fjList = new ArrayList<XkzsqzscsEntity>();
@@ -1100,14 +1118,14 @@ public class XkzsqCtl extends BaseWebCtl {
 		List<CodeEntity> list = securityMgr.codeService().findByPid(pid);
 		return list;
 	}
-	
+
 	@RequestMapping(value = "/selectQyxz")
 	@ResponseBody
 	public List<CodeEntity> selectQyxz() {
 		List<CodeEntity> list = securityMgr.codeService().findValidCodesByGroupCode(Constants.GROUP_CODE_QYXZ);
 		return list;
 	}
-	
+
 	// 查看
 	@RequestMapping(value = "/view")
 	public String view(Model model, String id, String flag, String opflag) {
@@ -1494,19 +1512,31 @@ public class XkzsqCtl extends BaseWebCtl {
 
 	/**
 	 * 提交流程
+	 * 
 	 * @param model
 	 * @param code
-	 * @param jydyids  经营地域IDS
-	 * @param accid 附件ID
-	 * @param mtids 码头ID
- 	 * @param bwids 泊位ID
-	 * @param cgids 储罐ID
-	 * @param ckids 仓库ID
-	 * @param dcids 堆场ID
-	 * @param ryids 人员ID
-	 * @param sssbids  设备设施ID
-	 * @param qytzids 企业投资ID
-	 * @param zxjxids 装卸机械ID
+	 * @param jydyids
+	 *            经营地域IDS
+	 * @param accid
+	 *            附件ID
+	 * @param mtids
+	 *            码头ID
+	 * @param bwids
+	 *            泊位ID
+	 * @param cgids
+	 *            储罐ID
+	 * @param ckids
+	 *            仓库ID
+	 * @param dcids
+	 *            堆场ID
+	 * @param ryids
+	 *            人员ID
+	 * @param sssbids
+	 *            设备设施ID
+	 * @param qytzids
+	 *            企业投资ID
+	 * @param zxjxids
+	 *            装卸机械ID
 	 * @return
 	 */
 	@RequestMapping(value = "/submit")
@@ -1825,6 +1855,7 @@ public class XkzsqCtl extends BaseWebCtl {
 
 	/**
 	 * 流程退回后提交
+	 * 
 	 * @param code
 	 * @param jydyids
 	 * @param accid
@@ -2118,6 +2149,7 @@ public class XkzsqCtl extends BaseWebCtl {
 
 	/**
 	 * 删除经营地址
+	 * 
 	 * @param model
 	 * @param id
 	 * @return
@@ -2367,14 +2399,14 @@ public class XkzsqCtl extends BaseWebCtl {
 	public WebJsonResult findJyzl(Model model, String[] jydyids) {
 		WebJsonResult wr = success();
 		List<XzjydyEntity> jyzlList = new ArrayList<XzjydyEntity>();
-		if ( jydyids !=null && jydyids.length>0){
-		for (int i = 0; i < jydyids.length; i++) {
-			XzjydyEntity entity = xzjydyService.findOne(jydyids[i]);
-			if (entity != null) {
-				jyzlList.add(entity);
+		if (jydyids != null && jydyids.length > 0) {
+			for (int i = 0; i < jydyids.length; i++) {
+				XzjydyEntity entity = xzjydyService.findOne(jydyids[i]);
+				if (entity != null) {
+					jyzlList.add(entity);
+				}
 			}
 		}
-		}
 		wr.setAttr("jyzlList", jyzlList);
 		return wr;
 	}
@@ -2637,7 +2669,7 @@ public class XkzsqCtl extends BaseWebCtl {
 			if (!StringUtils.isEmpty(user.getSsglbm())) {
 				jds.setDw(user.getSsglbm().getGkglbmqc());
 			}
-			//获取时间
+			// 获取时间
 			SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd");
 			Date today = new Date();
 			jds.setRq(dateTimeFormat.format(today));
@@ -2697,7 +2729,7 @@ public class XkzsqCtl extends BaseWebCtl {
 				code = securityMgr.codeService().findOne(code.getPid());
 			}
 			szd = szd + "港经证";
-			
+
 			xkz.setGkjyxkzh("");
 			xkz.setFzrq(new Date());
 			xkz.setYxqq(new Date());
@@ -2714,83 +2746,51 @@ public class XkzsqCtl extends BaseWebCtl {
 			xkz = xkzxxService.save(xkz);
 
 			// 经营人许可证更新
-			/*jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
-			jyr.setFddbr(xkzsq.getFddbr());
-			jyr.setLxdh(xkzsq.getLxdh());
-			jyr.setCz(xkzsq.getCz());
-			jyr.setGkjyxkzh(xkzbh);
-			jyr.setJyfw(jyfwstr2);
-			jyr.setJyqy(jylzstr);
-			jyr.setFzrq(dateTimeFormat.parse(date));
-			jyr.setFzrq(xkz.getFzrq());
-			jyr.setFzjg(xkz.getFzjg());
-			gkjyrService.save(jyr);*/
+			/*
+			 * jyr.setRecordStatus(BaseEntity.RECORD_STATE_VALID);
+			 * jyr.setFddbr(xkzsq.getFddbr()); jyr.setLxdh(xkzsq.getLxdh());
+			 * jyr.setCz(xkzsq.getCz()); jyr.setGkjyxkzh(xkzbh);
+			 * jyr.setJyfw(jyfwstr2); jyr.setJyqy(jylzstr);
+			 * jyr.setFzrq(dateTimeFormat.parse(date));
+			 * jyr.setFzrq(xkz.getFzrq()); jyr.setFzjg(xkz.getFzjg());
+			 * gkjyrService.save(jyr);
+			 */
 
 			// xkzglb表操作
 			// 码头泊位储罐仓库堆场人员设备信息企业投资
-			/*List<XkzglbEntity> xkzglblist = xkzglbService.findByCzid(sqid);
-			if (xkzglblist != null && xkzglblist.size() > 0) {
-				for (XkzglbEntity xkzglb : xkzglblist) {
-					xkzglb.setXkzid(xkz.getId());
-					xkzglb.setXkzbh(xkz.getGkjyxkzh());
-					xkzglbService.save(xkzglb);
-					if (xkzglb.getType().equals("1")) {
-						MtEntity mt = mtService.findOne(xkzglb.getYwid());
-						if (mt != null) {
-							mt.setXkzid(xkz.getId());
-							mtService.save(mt);
-						}
-					} else if (xkzglb.getType().equals("2")) {
-						BwEntity bw = bwService.findOne(xkzglb.getYwid());
-						if (bw != null) {
-							bw.setXkzid(xkz.getId());
-							bwService.save(bw);
-						}
-					} else if (xkzglb.getType().equals("3")) {
-						CgEntity cg = cgService.findOne(xkzglb.getYwid());
-						if (cg != null) {
-							cg.setXkzid(xkz.getId());
-							cgService.save(cg);
-						}
-					} else if (xkzglb.getType().equals("4")) {
-						CkEntity ck = ckService.findOne(xkzglb.getYwid());
-						if (ck != null) {
-							ck.setXkzid(xkz.getId());
-							ckService.save(ck);
-						}
-					} else if (xkzglb.getType().equals("5")) {
-						DcEntity dc = dcService.findOne(xkzglb.getYwid());
-						if (dc != null) {
-							dc.setXkzid(xkz.getId());
-							dcService.save(dc);
-						}
-					} else if (xkzglb.getType().equals("6")) {
-						RyEntity ry = ryService.findOne(xkzglb.getYwid());
-						if (ry != null) {
-							ry.setXkzid(xkz.getId());
-							ryService.save(ry);
-						}
-					} else if (xkzglb.getType().equals("7")) {
-						SssbEntity sssb = sssbService.findOne(xkzglb.getId());
-						if (sssb != null) {
-							sssb.setXkzid(xkz.getId());
-							sssbService.save(sssb);
-						}
-					} else if (xkzglb.getType().equals("8")) {
-						QytzEntity qytz = qytzService.findOne(xkzglb.getId());
-						if (qytz != null) {
-							qytz.setXkzid(xkz.getId());
-							qytzService.save(qytz);
-						}
-					} else if (xkzglb.getType().equals("9")) {
-						ZxjxEntity zxjx = zxjxService.findOne(xkzglb.getId());
-						if (zxjx != null) {
-							zxjx.setXkzid(xkz.getId());
-							zxjxService.save(zxjx);
-						}
-					}
-				}
-			}*/
+			/*
+			 * List<XkzglbEntity> xkzglblist = xkzglbService.findByCzid(sqid);
+			 * if (xkzglblist != null && xkzglblist.size() > 0) { for
+			 * (XkzglbEntity xkzglb : xkzglblist) {
+			 * xkzglb.setXkzid(xkz.getId()); xkzglb.setXkzbh(xkz.getGkjyxkzh());
+			 * xkzglbService.save(xkzglb); if (xkzglb.getType().equals("1")) {
+			 * MtEntity mt = mtService.findOne(xkzglb.getYwid()); if (mt !=
+			 * null) { mt.setXkzid(xkz.getId()); mtService.save(mt); } } else if
+			 * (xkzglb.getType().equals("2")) { BwEntity bw =
+			 * bwService.findOne(xkzglb.getYwid()); if (bw != null) {
+			 * bw.setXkzid(xkz.getId()); bwService.save(bw); } } else if
+			 * (xkzglb.getType().equals("3")) { CgEntity cg =
+			 * cgService.findOne(xkzglb.getYwid()); if (cg != null) {
+			 * cg.setXkzid(xkz.getId()); cgService.save(cg); } } else if
+			 * (xkzglb.getType().equals("4")) { CkEntity ck =
+			 * ckService.findOne(xkzglb.getYwid()); if (ck != null) {
+			 * ck.setXkzid(xkz.getId()); ckService.save(ck); } } else if
+			 * (xkzglb.getType().equals("5")) { DcEntity dc =
+			 * dcService.findOne(xkzglb.getYwid()); if (dc != null) {
+			 * dc.setXkzid(xkz.getId()); dcService.save(dc); } } else if
+			 * (xkzglb.getType().equals("6")) { RyEntity ry =
+			 * ryService.findOne(xkzglb.getYwid()); if (ry != null) {
+			 * ry.setXkzid(xkz.getId()); ryService.save(ry); } } else if
+			 * (xkzglb.getType().equals("7")) { SssbEntity sssb =
+			 * sssbService.findOne(xkzglb.getId()); if (sssb != null) {
+			 * sssb.setXkzid(xkz.getId()); sssbService.save(sssb); } } else if
+			 * (xkzglb.getType().equals("8")) { QytzEntity qytz =
+			 * qytzService.findOne(xkzglb.getId()); if (qytz != null) {
+			 * qytz.setXkzid(xkz.getId()); qytzService.save(qytz); } } else if
+			 * (xkzglb.getType().equals("9")) { ZxjxEntity zxjx =
+			 * zxjxService.findOne(xkzglb.getId()); if (zxjx != null) {
+			 * zxjx.setXkzid(xkz.getId()); zxjxService.save(zxjx); } } } }
+			 */
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -2895,6 +2895,7 @@ public class XkzsqCtl extends BaseWebCtl {
 
 	/**
 	 * 保存其他附件
+	 * 
 	 * @param filename
 	 * @param model
 	 * @return
@@ -2916,7 +2917,9 @@ public class XkzsqCtl extends BaseWebCtl {
 
 	/**
 	 * 删除附件
-	 * @param id  附件ID
+	 * 
+	 * @param id
+	 *            附件ID
 	 * @param model
 	 * @return
 	 */
@@ -2928,5 +2931,4 @@ public class XkzsqCtl extends BaseWebCtl {
 		return wr;
 	}
 
-	
 }

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/vo/XkzsqVo.java

@@ -53,6 +53,15 @@ public class XkzsqVo extends BaseVo {
 	private Date fhrq = null;
 	// 申请经营业务种类ids
 	private String sqjyywzlids;
+	private String currentname;/* 流程节点名 */
+	
+	public String getCurrentname() {
+		return currentname;
+	}
+
+	public void setCurrentname(String currentname) {
+		this.currentname = currentname;
+	}
 
 	private String taskState;
 

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/ctl/XkzyxCtl.java

@@ -222,6 +222,11 @@ public class XkzyxCtl extends BaseWebCtl {
 			if (entity != null) {
 				BeanUtils.copyProperties(entity, vo);
 				if (entity.getRecordStatus() != 9) {
+					// 获取流程最新步骤
+					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), XkzyxEntity.PROCESS_DEFINITION_KEY);
+					if (info != null) {
+						vo.setCurrentname(info.getCurrName());
+					}
 					if ((xkzyxService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) || xkzyxService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) {
 						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzyxEntity.PROCESS_DEFINITION_KEY);
 						if (lists != null & lists.size() > 0) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkyx/vo/XkzyxVo.java

@@ -52,6 +52,15 @@ public class XkzyxVo extends BaseVo {
 	private String xkzbh = null;
 	private String taskState;
 	private String opflag = null;
+	private String currentname;/* 流程节点名 */
+
+	public String getCurrentname() {
+		return currentname;
+	}
+
+	public void setCurrentname(String currentname) {
+		this.currentname = currentname;
+	}
 
 	public String getOpflag() {
 		return opflag;

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/ctl/XkzzxCtl.java

@@ -271,6 +271,11 @@ public class XkzzxCtl extends BaseWebCtl {
 			if (entity != null) {
 				BeanUtils.copyProperties(entity, vo);
 				if (entity.getRecordStatus() != 9) {
+					// 获取流程最新步骤
+					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), XkzzxEntity.PROCESS_DEFINITION_KEY);
+					if (info != null) {
+						vo.setCurrentname(info.getCurrName());
+					}
 					if ((xkzzxService.getTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) || xkzzxService.getCandidateTaskByUserAndBusKey(SecUtils.getCurrUser().getId().toString(), entity.getId().toString()) != null) {
 						List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), XkzzxEntity.PROCESS_DEFINITION_KEY);
 						if (lists != null & lists.size() > 0) {

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxkzx/vo/XkzzxVo.java

@@ -54,6 +54,15 @@ public class XkzzxVo extends BaseVo {
 	// 许可证编号
 	private String xkzbh = null;
 	private String taskState;
+	private String currentname;/* 流程节点名 */
+
+	public String getCurrentname() {
+		return currentname;
+	}
+
+	public void setCurrentname(String currentname) {
+		this.currentname = currentname;
+	}
 
 	public String getTaskState() {
 		return taskState;

gkjsjy/trunk/src/com/xt/jygl/set/user/ctl/UserCtl.java

@@ -195,7 +195,7 @@ public class UserCtl extends BaseWebCtl {
 			return wr;
 		}
 		UserEntity user1 = new UserEntity();
-		user1 = securityMgr.userService().findByUname(user.getUname());
+		user1 = securityMgr.userService().findByUnameszd(user.getUname(),GlobalData.CITY_CODE);
 		if (StringUtils.isEmpty(user.getId())) {
 			if (user1 != null) {
 				wr.setSuccess(false);

gkjsjy/trunk/src/com/xt/jygl/set/user/webservice/UserWebService.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 
 import com.xt.jygl.common.BaseWebCtl;
+import com.xt.jygl.common.GlobalData;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.sec.user.entity.UserEntity;
 
@@ -18,13 +19,13 @@ public class UserWebService extends BaseWebCtl {
 	private SecurityMgr securityMgr;
 
 	public UserEntity query(String uname) {
-		return securityMgr.userService().findByUname(uname);
+		return securityMgr.userService().findByUnameszd(uname,GlobalData.CITY_CODE);
 	}
 	
 	//用户新增(0:创建失败;1:创建成功)
 	public String createUser(String userCode,String userName,String password){
 		String str = "1";
-		UserEntity user = securityMgr.userService().findByUname(userCode);
+		UserEntity user = securityMgr.userService().findByUnameszd(userCode,GlobalData.CITY_CODE);
 		if(null != user){
 			str= "0-用户名已存在";
 		}else{
@@ -52,7 +53,7 @@ public class UserWebService extends BaseWebCtl {
 	//用户修改密码
 	public String changePassword(String userCode,String password){
 		String str="1";
-		UserEntity user = securityMgr.userService().findByUname(userCode);
+		UserEntity user = securityMgr.userService().findByUnameszd(userCode,GlobalData.CITY_CODE);
 		if(null!=user){			
 			try{
 				user.setPassword(BaseWebCtl.destoSHA256Encrypt(password));
@@ -71,7 +72,7 @@ public class UserWebService extends BaseWebCtl {
 	//用户删除
 	public String deleteUser(String userCode){
 		String str="1";
-		UserEntity user = securityMgr.userService().findByUname(userCode);
+		UserEntity user = securityMgr.userService().findByUnameszd(userCode,GlobalData.CITY_CODE);
 		if(null!=user){
 			try {
 				securityMgr.userService().logicDelete(user.getId());
@@ -90,7 +91,7 @@ public class UserWebService extends BaseWebCtl {
 	//查询是否存在用户
 	public String queryUser(String userCode){
 		String str="";
-		UserEntity user = securityMgr.userService().findByUname(userCode);
+		UserEntity user = securityMgr.userService().findByUnameszd(userCode,GlobalData.CITY_CODE);
 		if(user!=null){
 			str="1";
 		}else{

gkjsjy/trunk/src/com/xt/jygl/workflow/dao/TaskInfoDao.java

@@ -40,7 +40,7 @@ public interface TaskInfoDao extends SecRepository<TaskInfoEntity, String> {
 	@Query("from TaskInfoEntity where busId = ?1 and busKey = ?2 and state = 3")
 	public List<TaskInfoEntity> findByBusIdAndBusKeyAndRecordStatus(String busId, String busKey);
 
-	@Query(value = "select t.*  from GK_OPERATION_JSJY_TASK t where t.bus_id = ?1 and t.bus_key = ?2 and t.state=3 and t.step = (select max(to_number(step)) from GK_OPERATION_JSJY_TASK where bus_id = ?1 and bus_key = ?2 and state = 3)", nativeQuery = true)
+	@Query(value = "select t.*  from GK_OPERATION_JSJY_TASK t where t.bus_id = ?1 and t.bus_key = ?2  and t.step = (select max(to_number(step)) from GK_OPERATION_JSJY_TASK where bus_id = ?1 and bus_key = ?2 )", nativeQuery = true)
 	public TaskInfoEntity findByStep(String busId, String busKey);
 
 	@Query("from TaskInfoEntity where busId = ?1 and taskKey = ?2 and sfth is null")

gkjsjy/trunk/src/com/xtframe/core/user/service/UserService.java

@@ -65,7 +65,7 @@ public interface UserService {
 	 *            用户登录名称
 	 * @return User
 	 */
-	public UserEntity findByUname(String uname);
+	public UserEntity findByUnameszd(String uname,String szd);
 
 	/**
 	 * 保存用户

gkjsjy/trunk/src/com/xtframe/core/webService/AuthHandler.java

@@ -22,6 +22,7 @@ import org.apache.log4j.Logger;
 import org.springframework.stereotype.Controller;
 
 import com.sun.net.httpserver.HttpExchange;
+import com.xt.jygl.common.GlobalData;
 import com.xtframe.core.support.SecurityMgr;
 import com.xtframe.core.user.service.UserService;
 import com.xtframe.core.utils.ApplicationContextHelper;
@@ -82,7 +83,7 @@ public class AuthHandler implements SOAPHandler<SOAPMessageContext> {
 				if (infos.length == 2) {
 					SecurityMgr securityMgr = (SecurityMgr) ApplicationContextHelper.getBean(SecurityMgr.class);
 					UserService userService = securityMgr.userService();
-					UserEntity user = userService.findByUname(infos[0]);
+					UserEntity user = userService.findByUnameszd(infos[0],GlobalData.CITY_CODE);
 					if (user != null && user.getPassword() != null && user.getPassword().equals(infos[1])) {
 						userLocal.set(user);
 						return true;

gkjsjy/trunk/src/com/xtframe/sec/realm/CustomRealm.java

@@ -56,7 +56,7 @@ public class CustomRealm extends AuthorizingRealm implements SecurityMgrAware {
 	@Override
 	protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken authcToken) throws AuthenticationException {
 		UsernamePasswordToken token = (UsernamePasswordToken) authcToken;
-		UserEntity user = securityMgr.userService().findByUname(token.getUsername());
+		UserEntity user = securityMgr.userService().findByUnameszd(token.getUsername(),GlobalData.CITY_CODE);
 		if (user != null) {
 			GlobalData.isSSO = false;
 			return new SimpleAuthenticationInfo(user, user.getPassword(), getName());

gkjsjy/trunk/src/com/xtframe/sec/realm/XtCasRealm.java

@@ -104,7 +104,7 @@ public class XtCasRealm extends CasRealm implements SecurityMgrAware {
 
 			@SuppressWarnings("rawtypes")
 			List principals = CollectionUtils.asList(new Object[] { userId, attributes });
-			UserEntity user = securityMgr.userService().findByUname(userId);
+			UserEntity user = securityMgr.userService().findByUnameszd(userId,GlobalData.CITY_CODE);
 
 			GlobalData.isSSO = true;
 

gkjsjy/trunk/src/com/xtframe/sec/user/dao/UserDao.java

@@ -19,8 +19,8 @@ public interface UserDao extends SecRepository<UserEntity, String> {
 	 * @param uname
 	 * @return
 	 */
-	@Query("SELECT m from UserEntity m  where m.uname =?1 and m.recordStatus<>9")
-	public UserEntity findByUname(String uname);
+	@Query("SELECT m from UserEntity m  where m.uname =?1 and m.recordStatus<>9 and m.szd.id= ?2")
+	public UserEntity findByUnameszd(String uname,String szd);
 	
 	
 	@Query(value = "SELECT id,name,uname,password from GK_BASIC_JSJY_USER m  where m.uname =?1  and m.password=?2",nativeQuery = true)

gkjsjy/trunk/src/com/xtframe/sec/user/service/impl/UserServiceImpl.java

@@ -20,8 +20,8 @@ public class UserServiceImpl extends BaseSecurityService implements UserService
 	private MenuDao menuDao;
 
 	@Override
-	public UserEntity findByUname(String uname) {
-		return dao.findByUname(uname);
+	public UserEntity findByUnameszd(String uname,String szd) {
+		return dao.findByUnameszd(uname,szd);
 	}
 
 	@Override