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

gkjsjy/trunk/WebContent/WEB-INF/pages/gkjygl/gkjyxkgl/gkjyxksq/xkzsqaddmain.jsp

@@ -106,11 +106,11 @@
 						$('#gkjyrid').val(data.id);
 						$('#gkjyr').val(data.gkjyr);
 						$('#bgdz').val(data.bgdz);
-						
 						//孙正添加的
-						$('#szdzw').html(data.szd.text);
-						$('#szgkzw').html(data.szgk.gkmc);
-						$('#szgqzw').html(data.szgq.gqmc);
+						$('#szdzw').html(data.szdzw);
+						$('#szgkzw').html(data.szgkzw);
+						$('#szgqzw').html(data.szgqzw);
+						$('#sfwhqyzw').html(data.sfwhqyzw);
 						$('#xzqh').html(data.xzqh);
 						$('#yzbm').val(data.yzbm);
 						$('#gkjyxkzh').val(data.gkjyxkzh);
@@ -167,7 +167,7 @@
 						$('#tlzyxcd').val(data.tlzyxcd);
 						$('#cgsl').val(data.cgsl);
 						$('#cgzrl').val(data.cgzrl);
-						xkzsq.detail.initXzqh('xzqhsel',data.xzqh,data.szgk.gkmc);
+						xkzsq.detail.initXzqh('xzqhsel',data.xzqh,data.szgkzw);
 						xkzsq.detail.initQyxz('qyxzsel',data.qyxz);
 					}, "json");
 				} else {
@@ -495,7 +495,7 @@
 											<th width="10%">所在港区：</th>
 											<td width="15%"><span id="szgqzw">${gkjyr.szgqzw}</span></td>
 											<th width="10%">是否危货企业：</th>
-											<td width="15%"><span id="sfwhqysel"></span></td>
+											<td width="15%"><span id="sfwhqyzw">${gkjyr.sfwhqyzw }</span></td>
 											
 										</tr>
 										<tr>

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyr/jyrjbxx/ctl/GkjyrCtl.java

@@ -1051,6 +1051,7 @@ public class GkjyrCtl extends BaseWebCtl {
 			vo.setSzgq(null != jyr.getSzgq() ? jyr.getSzgq().getId() : "");
 			vo.setMtjgxs(null != jyr.getMtjgxs() ? jyr.getMtjgxs().getId() : "");
 			vo.setMtjgxszw(null != jyr.getMtjgxs() ? jyr.getMtjgxs().getText() : "");
+			vo.setSfwhqyzw(null != jyr.getSfwhqy() ? jyr.getSfwhqy().getText() : "");
 		}
 		return vo;
 	}

gkjsjy/trunk/src/com/xt/jygl/gkjygl/gkjyxkgl/gkjyxksq/service/impl/XkzsqServiceImpl.java

@@ -102,7 +102,13 @@ public class XkzsqServiceImpl extends BaseWorkFlowServiceImpl<XkzsqEntity, Strin
 			entity.setRecordStatus(BaseEntity.RECORD_STATE_SUBMIT);
 			entity = this.save(entity);
 			String gqid = "";
-			if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+			if (securityMgr.getCurrUser() != null) {
+				if (securityMgr.getCurrUser().getSfjyr().getText().equals("是")) {
+					gqid = entity.getSzgq().getId();
+				} else {
+					gqid = entity.getSzgq().getId();
+				}
+			} else {
 				gqid = entity.getSzgq().getId();
 			}
 			Map<String, Object> variables = new HashMap<String, Object>();