Merge branch 'developer' of 172.16.10.76:moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/OrgUsrServiceImpl.java

@@ -631,7 +631,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<FormValue> formValue = getFormValue(id);
         OrgPersonFormVo orgPersonFormVo = new OrgPersonFormVo(formValue);
         BeanUtils.copyProperties(orgUsr, orgPersonFormVo);
-        orgPersonFormVo.setParentName(getById(orgUsr.getParentId()).getBizOrgName());
+        OrgUsr parent = getById(orgUsr.getParentId());
+        if (!ObjectUtils.isEmpty(parent)) {
+        	orgPersonFormVo.setParentName(parent.getBizOrgName());
+        }
+        
         return orgPersonFormVo;
     }