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

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

@@ -182,8 +182,9 @@ public class JsjdcbsjCtl extends BaseWebCtl {
 				if (entity.getRecordStatus() != 9) {
 					// 获取流程最新步骤
 					TaskInfoEntity info = taskInfoService.findByStep(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
-					vo.setCurrentname(info.getCurrName());
-
+					if(info!=null){
+						vo.setCurrentname(info.getCurrName());
+					}
 					List<TaskInfoEntity> lists = taskInfoService.findByBusIdAndBusKeyAndRecordStatus(entity.getId(), JsjdcbsjEntity.PROCESS_DEFINITION_KEY);
 					if (lists != null & lists.size() > 0) {
 						TaskInfoEntity taskinfo = lists.get(0);

gkjsjy/trunk/src/com/xt/jygl/gkjsgl/jsjdgl/ctl/JsjdglCtl.java

@@ -899,7 +899,10 @@ public class JsjdglCtl extends BaseWebCtl {
 			AccessoryEntity qtfj = accessoryService.findOne(qtfjzdlist.get(i).getFjid());
 			JsjdfjVo fjnamevo = new JsjdfjVo();
 			fjnamevo.setFbdw(qtfjzdlist.get(i).getFbdw());
-			String fbsj=dateFormater.format(qtfjzdlist.get(i).getFbsj());
+			String fbsj="";
+			if(qtfjzdlist.get(i).getFbsj()!=null){
+				fbsj = dateFormater.format(qtfjzdlist.get(i).getFbsj());
+			}
 			fjnamevo.setFbsj(fbsj);
 			fjnamevo.setWjh(qtfjzdlist.get(i).getWjh());
 			fjnamevo.setFjid(qtfj.getId());
@@ -948,10 +951,10 @@ public class JsjdglCtl extends BaseWebCtl {
 					jsfjvo.setFbsj(date2);
 				}
 				jsfjvo.setWjh(jsfj.getWjh());
+				jsfjvo.setId(jsfj.getId());
 			}
 			jsfjvo.setFjmc(acclist.get(i).getName());
 			jsfjvo.setFjid(fjid);
-			jsfjvo.setId(jsfj.getId());
 			fjvolist.add(jsfjvo);
 		}
 		model.addAttribute("fjvolist" + opflag, fjvolist);