Commit 01176d66 authored by tangwei's avatar tangwei

修改bug

parent fa598925
...@@ -82,6 +82,8 @@ public class OrgUsrFormDto implements Serializable { ...@@ -82,6 +82,8 @@ public class OrgUsrFormDto implements Serializable {
@ApiModelProperty(value = "唯一编号") @ApiModelProperty(value = "唯一编号")
private String code; private String code;
@ApiModelProperty(value = "归属机构/部门")
private String parentName;
@ApiModelProperty(value = "消防管理人") @ApiModelProperty(value = "消防管理人")
......
...@@ -862,8 +862,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -862,8 +862,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
orgUsrFormVo.setXfaq(Xfaq!=null?Xfaq.get("name"):""); orgUsrFormVo.setXfaq(Xfaq!=null?Xfaq.get("name"):"");
orgUsrFormVo.setXfgl(Xfgl!=null?Xfgl.get("name"):""); orgUsrFormVo.setXfgl(Xfgl!=null?Xfgl.get("name"):"");
orgUsrFormVo.setDwfz(Dwfz!=null?Dwfz.get("name"):""); orgUsrFormVo.setDwfz(Dwfz!=null?Dwfz.get("name"):"");
orgUsrFormVo.setParentName( getById(orgUsr.getParentId()).getBizOrgName());
return orgUsrFormVo; return orgUsrFormVo;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment