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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjsgl/jsjdgl/jsjdglmain.jsp

@@ -242,7 +242,7 @@
 							<c:if test="${sjords == 1 }">
 							<c:if test="${isjyr == 2}">
 							<a class="btn btn-default btn-xs" href="###"  onclick="jsjdgl.main.banlitest('${jsjdgl.id}')" title="上传">
-									   <i class="glyphicon glyphicon-check"></i> 
+									   <i class="glyphicon glyphicon-hand-up"></i> 
 									          </a>
 							</c:if>	
 							</c:if>					

gkjsjy/trunk/WebContent/WEB-INF/pages/sys/main.jsp

@@ -156,9 +156,9 @@
 		                 <p style="color:#FFF;">理货申请【<span id="lhsqnum" onclick="main.menuClick('todo','待办一览','/todo?type=lhsq')" style="cursor: pointer;"></span>】</p>	
 						 <p style="color:#FFF;">理货变更【<span id="lhbgnum" onclick="main.menuClick('todo','待办一览','/todo?type=lhbg')" style="cursor: pointer;"></span>】</p>	
 						 <p style="color:#FFF;">理货延续【<span id="lhyxnum" onclick="main.menuClick('todo','待办一览','/todo?type=lhyx')" style="cursor: pointer;"></span>】</p>	
-		                 <p style="color:#FFF;">建设进度初步设计申请【<span id="jsjdcbsjnum" onclick="main.menuClick('todo','待办一览','/todo?type=jsjdcbsj')" style="cursor: pointer;"></span>】</p>	
-						 <p style="color:#FFF;">建设进度初步设计变更【<span id="jsjdbgnum" onclick="main.menuClick('todo','待办一览','/todo?type=jsjdbg')" style="cursor: pointer;"></span>】</p>	
-						 <p style="color:#FFF;">建设进度竣工申请【<span id="jgsqnum" onclick="main.menuClick('todo','待办一览','/todo?type=jgsq')" style="cursor: pointer;"></span>】</p>	
+		                 <p style="color:#FFF;">港口工程初步设计申请【<span id="jsjdcbsjnum" onclick="main.menuClick('todo','待办一览','/todo?type=jsjdcbsj')" style="cursor: pointer;"></span>】</p>	
+						 <p style="color:#FFF;">港口工程初步设计变更【<span id="jsjdbgnum" onclick="main.menuClick('todo','待办一览','/todo?type=jsjdbg')" style="cursor: pointer;"></span>】</p>	
+						 <p style="color:#FFF;">港口工程竣工验收【<span id="jgsqnum" onclick="main.menuClick('todo','待办一览','/todo?type=jgsq')" style="cursor: pointer;"></span>】</p>	
 		                </div>
 		                 <a href="#" onclick="main.menuClick('todo','待办一览','/todo')"><img src="${app }/static/biz/image/more.png" />更多</a>
 			            </div>

gkjsjy/trunk/WebContent/WEB-INF/pages/sys/todo.jsp

@@ -54,16 +54,17 @@
 	                        		<option value="xkzyx">许可证延续</option>
 	                        		<option value="xkzzx">许可证注销</option>
 	                        		<option value="jdtx">监督提醒</option>
+	                        		<option value="jsjd">建设进度</option>
 	                        		<option value="qt">其他</option>
 	                        		</c:if>
 	                        		<c:if test="${ssflag == 0 }">
 	                        		<option value="lhsq">理货申请</option>
 	                        		<option value="lhbg">理货变更 </option>
 	                        		<option value="lhyx">理货延续</option>
-	                        		<option value="jsjdcbsj">建设进度初步设计申请</option>
-	                        		<option value="jsjdbg">建设进度初步设计变更</option>
-	                        		<option value="jgsq">建设进度竣工申请</option>
-	                        		<option value="jdtx">监督提醒申请</option>
+	                        		<option value="jsjdcbsj">港口工程初步设计申请</option>
+	                        		<option value="jsjdbg">港口工程初步设计变更</option>
+	                        		<option value="jgsq">港口工程竣工验收</option>
+	                        		<option value="jdtx">监督提醒</option>
 	                        		</c:if>
 	                        		
 	                        	</select>

gkjsjy/trunk/WebContent/static/biz/js/todo.js

@@ -49,6 +49,8 @@ todo.banli=function(type,id){
 		location.href=$.app+"/lhzx/view?flag=audit&path="+path+"&id="+id+"&type="+type;
 	}else if(type=="jdtx"){
 		location.href=$.app+"/jdtxxx/view?flag=audit&path="+path+"&id="+id+"&type="+type;
+	}else if(type="jsjd"){
+		location.href=$.app+"/jsjdgl/edit?id="+id+"&flag=audit&type="+type;
 	}
 }
 
@@ -88,6 +90,9 @@ todo.banliTh=function(type,id){
 		location.href=$.app+"/lhzx/edit?flag=th&path="+path+"&id="+id+"&type="+type;
 	}else if(type=="jdtx"){
 		location.href=$.app+"/jdtxxx/edit?flag=audit&path="+path+"&id="+id+"&type="+type;
+	}else if(type=="jsjd"){
+		location.href=$.app+"/jsjdgl/edit?id="+id+"&flag=audit&type="+type;
+	
 	}
 }
 

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

@@ -40,6 +40,8 @@ import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.common.SearchCondition;
 import com.xt.jygl.common.Utils;
+import com.xt.jygl.ftp.Ftp;
+import com.xt.jygl.ftp.FtpUtil;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -245,7 +247,7 @@ public class XkzbgCtl extends BaseWebCtl {
 					if (StringUtils.isNotEmpty(v)) {
 						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)) {
@@ -1093,6 +1095,36 @@ public class XkzbgCtl extends BaseWebCtl {
 								for (XkzbgfjEntity fj : xkzfjList) {
 									if ((i + 1) == fj.getSortno()) {
 										vo.setFjid(fj.getFjid());
+										if (!StringUtils.isEmpty(fj.getFjid())) {
+											if (!GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+												AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
+												if (acc != null) {
+													try {
+														Ftp f = getftp();
+														// 本地目录
+														String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
+														File newfile = new File(localBaseDir);
+														// 如果文件夹不存在则创建
+														if (!newfile.exists() && !newfile.isDirectory()) {
+															newfile.mkdirs();
+														}
+														// 远程目录
+														String remoteBaseDir = acc.getFilepath();
+														// 下载ftp文件
+														boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
+														if (downflag) {
+															System.out.println("ok");
+															acc.setFjbz("1");
+															accessoryService.save(acc);
+														}
+
+													} catch (Exception e) {
+														e.printStackTrace();
+													}
+												}
+											}
+
+										}
 										vo.setFjmc(fj.getFjmc());
 										vo.setId(fj.getId());
 										break;
@@ -2695,7 +2727,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		}
 		return wr;
 	}
-	
+
 	@RequestMapping(value = "/selectXzqh")
 	@ResponseBody
 	public List<CodeEntity> selectXzqh(Model model, String gk) {
@@ -2707,7 +2739,7 @@ public class XkzbgCtl extends BaseWebCtl {
 		List<CodeEntity> list = securityMgr.codeService().findByPid(pid);
 		return list;
 	}
-	
+
 	@RequestMapping(value = "/selectQyxz")
 	@ResponseBody
 	public List<CodeEntity> selectQyxz() {
@@ -3092,9 +3124,10 @@ public class XkzbgCtl extends BaseWebCtl {
 		return "gkjygl/gkjyxkgl/gkjyxkbg/xkzbgjds";
 
 	}
-	
+
 	/**
 	 * 删除经营地址
+	 * 
 	 * @param model
 	 * @param id
 	 * @return

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

@@ -39,6 +39,8 @@ import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.common.SearchCondition;
 import com.xt.jygl.common.Utils;
+import com.xt.jygl.ftp.Ftp;
+import com.xt.jygl.ftp.FtpUtil;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -654,9 +656,37 @@ public class XkzsqCtl extends BaseWebCtl {
 						BeanUtils.copyProperties(entity, vo);
 						if (entity.getRecordStatus() != 9) {
 							for (XkzsqfjEntity fj : xkzfjList) {
-
 								if ((i + 1) == fj.getSortno()) {
 									vo.setFjid(fj.getFjid());
+									if (!StringUtils.isEmpty(fj.getFjid())) {
+										if (!GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+											AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
+											if (acc != null) {
+												try {
+													Ftp f = getftp();
+													// 本地目录
+													String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
+													File newfile = new File(localBaseDir);
+													// 如果文件夹不存在则创建
+													if (!newfile.exists() && !newfile.isDirectory()) {
+														newfile.mkdirs();
+													}
+													// 远程目录
+													String remoteBaseDir = acc.getFilepath();
+													// 下载ftp文件
+													boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
+													if (downflag) {
+														System.out.println("ok");
+														acc.setFjbz("1");
+														accessoryService.save(acc);
+													}
+
+												} catch (Exception e) {
+													e.printStackTrace();
+												}
+											}
+										}
+									}
 									vo.setFjmc(fj.getFjmc());
 									vo.setId(fj.getId());
 									break;

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

@@ -39,6 +39,8 @@ import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.common.SearchCondition;
 import com.xt.jygl.common.Utils;
+import com.xt.jygl.ftp.Ftp;
+import com.xt.jygl.ftp.FtpUtil;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -786,6 +788,35 @@ public class XkzyxCtl extends BaseWebCtl {
 							for (XkzyxfjEntity fj : xkzfjList) {
 								if ((i + 1) == fj.getSortno()) {
 									vo.setFjid(fj.getFjid());
+									if (!StringUtils.isEmpty(fj.getFjid())) {
+										if (!GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+											AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
+											if (acc != null) {
+												try {
+													Ftp f = getftp();
+													// 本地目录
+													String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
+													File newfile = new File(localBaseDir);
+													// 如果文件夹不存在则创建
+													if (!newfile.exists() && !newfile.isDirectory()) {
+														newfile.mkdirs();
+													}
+													// 远程目录
+													String remoteBaseDir = acc.getFilepath();
+													// 下载ftp文件
+													boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
+													if (downflag) {
+														System.out.println("ok");
+														acc.setFjbz("1");
+														accessoryService.save(acc);
+													}
+
+												} catch (Exception e) {
+													e.printStackTrace();
+												}
+											}
+										}
+									}
 									vo.setFjmc(fj.getFjmc());
 									vo.setId(fj.getId());
 									break;

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

@@ -40,6 +40,8 @@ import com.xt.jygl.common.Constants;
 import com.xt.jygl.common.GlobalData;
 import com.xt.jygl.common.SearchCondition;
 import com.xt.jygl.common.Utils;
+import com.xt.jygl.ftp.Ftp;
+import com.xt.jygl.ftp.FtpUtil;
 import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
 import com.xt.jygl.gkjcxx.gk.service.GkService;
 import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
@@ -1049,6 +1051,36 @@ public class XkzzxCtl extends BaseWebCtl {
 							for (XkzzxfjEntity fj : xkzfjList) {
 								if ((i + 1) == fj.getSortno()) {
 									vo.setFjid(fj.getFjid());
+									if (!StringUtils.isEmpty(fj.getFjid())) {
+										if (!GlobalData.DEPLOY_MODE.equals(Constants.DEPLOY_MODE_CITY) && GlobalData.FTP_FLAG.equals(Constants.YES)) {
+											AccessoryEntity acc = accessoryService.findOne(fj.getFjid());
+											if (acc != null) {
+												try {
+													Ftp f = getftp();
+													// 本地目录
+													String localBaseDir = GlobalData.UPLOAD_FILE_PATH + acc.getFilepath();
+													File newfile = new File(localBaseDir);
+													// 如果文件夹不存在则创建
+													if (!newfile.exists() && !newfile.isDirectory()) {
+														newfile.mkdirs();
+													}
+													// 远程目录
+													String remoteBaseDir = acc.getFilepath();
+													// 下载ftp文件
+													boolean downflag = FtpUtil.startDown(f, localBaseDir, remoteBaseDir, acc.getFilename());
+													if (downflag) {
+														System.out.println("ok");
+														acc.setFjbz("1");
+														accessoryService.save(acc);
+													}
+
+												} catch (Exception e) {
+													e.printStackTrace();
+												}
+											}
+										}
+
+									}
 									vo.setFjmc(fj.getFjmc());
 									vo.setId(fj.getId());
 									break;
@@ -2016,7 +2048,7 @@ public class XkzzxCtl extends BaseWebCtl {
 		}
 		return "gkjygl/gkjyxkgl/gkjyxkzx/xkzzxedit";
 	}
-	
+
 	@RequestMapping(value = "/selectXzqh")
 	@ResponseBody
 	public List<CodeEntity> selectXzqh(Model model, String gk) {
@@ -2028,13 +2060,14 @@ public class XkzzxCtl 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 = "/delete")
 	@ResponseBody

gkjsjy/trunk/src/com/xt/jygl/sys/ctl/MainCtl.java

@@ -220,11 +220,12 @@ public class MainCtl extends BaseWebCtl {
 			volist = getJgsqList();
 		} else if ("jdtx".equals(type)) {
 			volist = getJdtxxxList();
+		} else if ("jsjd".equals(type)) {
+			volist = getJsjdList();
 		} else if ("qt".equals(type)) {
 			volist = getJsjdcbsjdsList();
 			volist.addAll(getJsjdbgdsList());
 			volist.addAll(getJgsqdsList());
-
 		}
 
 		// 判断省市区别
@@ -240,6 +241,7 @@ public class MainCtl extends BaseWebCtl {
 				volist.addAll(getJsjdbgdsList());
 				volist.addAll(getJgsqdsList());
 				volist.addAll(getJdtxxxList());
+				volist.addAll(getJsjdList());
 			}
 			model.addAttribute("ssflag", 1);
 		} else {
@@ -251,7 +253,6 @@ public class MainCtl extends BaseWebCtl {
 				volist.addAll(getJsjdcbsjList());
 				volist.addAll(getJsjdbgList());
 				volist.addAll(getJgsqList());
-				// volist.addAll(getJdtxxxList());
 			}
 			model.addAttribute("ssflag", 0);
 		}
@@ -430,7 +431,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setStatus("1");
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -444,7 +447,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setStatus("1");
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -489,7 +494,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setCreateTime(entity.getCreateDateTime().toString());
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -569,7 +576,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setCreateTime(entity.getCreateDateTime().toString());
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -608,7 +617,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setCreateTime(entity.getCreateDateTime().toString());
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -653,7 +664,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setCreateTime(entity.getCreateDateTime().toString());
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -688,7 +701,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setCreateTime(entity.getCreateDateTime().toString());
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -733,7 +748,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setCreateTime(entity.getCreateDateTime().toString());
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -768,7 +785,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setCreateTime(entity.getCreateDateTime().toString());
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -813,7 +832,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setCreateTime(entity.getCreateDateTime().toString());
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -849,7 +870,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setCreateTime(entity.getCreateDateTime().toString());
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -885,7 +908,9 @@ public class MainCtl extends BaseWebCtl {
 							item.setCreateTime(entity.getCreateDateTime().toString());
 							if (!StringUtils.isEmpty(entity.getCreateUser())) {
 								UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-								item.setSenderName(user.getName());
+								if (!StringUtils.isEmpty(user)) {
+									item.setSenderName(user.getName());
+								}
 							}
 							item.setBusinessKey(entity.getId());
 							volist.add(item);
@@ -932,7 +957,9 @@ public class MainCtl extends BaseWebCtl {
 								item.setCreateTime(entity.getCreateDateTime() != null ? entity.getCreateDateTime().toString() : "");
 								if (!StringUtils.isEmpty(entity.getCreateUser())) {
 									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-									item.setSenderName(user.getName());
+									if (!StringUtils.isEmpty(user)) {
+										item.setSenderName(user.getName());
+									}
 								}
 								item.setBusinessKey(entity.getId());
 								volist.add(item);
@@ -980,7 +1007,9 @@ public class MainCtl extends BaseWebCtl {
 								item.setCreateTime(entity.getCreateDateTime() != null ? entity.getCreateDateTime().toString() : "");
 								if (!StringUtils.isEmpty(entity.getCreateUser())) {
 									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-									item.setSenderName(user.getName());
+									if (!StringUtils.isEmpty(user)) {
+										item.setSenderName(user.getName());
+									}
 								}
 								item.setBusinessKey(entity.getId());
 								volist.add(item);
@@ -1027,7 +1056,9 @@ public class MainCtl extends BaseWebCtl {
 								item.setCreateTime(entity.getCreateDateTime() != null ? entity.getCreateDateTime().toString() : "");
 								if (!StringUtils.isEmpty(entity.getCreateUser())) {
 									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-									item.setSenderName(user.getName());
+									if (!StringUtils.isEmpty(user)) {
+										item.setSenderName(user.getName());
+									}
 								}
 								item.setBusinessKey(entity.getId());
 								volist.add(item);
@@ -1075,7 +1106,9 @@ public class MainCtl extends BaseWebCtl {
 								item.setCreateTime(entity.getCreateDateTime() != null ? entity.getCreateDateTime().toString() : "");
 								if (!StringUtils.isEmpty(entity.getCreateUser())) {
 									UserEntity user = securityMgr.userService().findById(entity.getCreateUser());
-									item.setSenderName(user.getName());
+									if (!StringUtils.isEmpty(user)) {
+										item.setSenderName(user.getName());
+									}
 								}
 								item.setBusinessKey(entity.getId());
 								volist.add(item);