1.机场单位详情调整

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrDto.java

@@ -24,7 +24,6 @@ import lombok.EqualsAndHashCode;
 public class OrgUsrDto extends BaseDto {
     private static final long serialVersionUID = 1L;
 
-
     @ApiModelProperty(value = "机构/部门名称")
     private String bizOrgName;
 
@@ -78,4 +77,13 @@ public class OrgUsrDto extends BaseDto {
     
     @ApiModelProperty(value = "动态表单值-DTO类型")
     private List<DynamicFormInstanceDto> dynamicFormValueDto;
+
+    @ApiModelProperty(value = "省市区code,用逗号分隔")
+    private String pczCode;
+
+    @ApiModelProperty(value = "省市区名称,用逗号分隔")
+    private String pczName;
+
+    @ApiModelProperty(value = "唯一编号")
+    private String code;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/OrgUsrFormDto.java

@@ -66,11 +66,6 @@ public class OrgUsrFormDto implements Serializable {
     @ApiModelProperty(value = "单位人员信息值")
     private List<OrgPersonFormDto> children;
 
-    
-   
-    
-    
-    
     public List<FormValue> getDynamicFormAlert() {
 		return dynamicFormAlert;
 	}
@@ -78,7 +73,16 @@ public class OrgUsrFormDto implements Serializable {
 
     @ApiModelProperty(value = "转换动态表单")
     private Map<String,Object> map=new HashMap<>();;
-    
+
+    @ApiModelProperty(value = "省市区code,用逗号分隔")
+    private String pczCode;
+
+    @ApiModelProperty(value = "省市区名称,用逗号分隔")
+    private String pczName;
+
+    @ApiModelProperty(value = "唯一编号")
+    private String code;
+
 
 	public void setDynamicFormAlert(List<FormValue> dynamicFormAlert) {
 		  if(dynamicFormAlert!=null) {

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/OrgUsr.java

@@ -69,4 +69,13 @@ public class OrgUsr extends BaseEntity {
     private String orgExpandAttr7;
 
     private String orgExpandAttr8;
+
+    @ApiModelProperty(value = "省市区code,用逗号分隔")
+    private String pczCode;
+
+    @ApiModelProperty(value = "省市区名称,用逗号分隔")
+    private String pczName;
+
+    @ApiModelProperty(value = "唯一编号")
+    private String code;
 }

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

@@ -127,6 +127,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			return menu;
 		}).collect(Collectors.toList());
 
+
+
 		List<OrgMenuDto> result = new ArrayList<>();
 		Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
 		menuList.forEach(e -> map.put(e.getKey(), e));
@@ -700,7 +702,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}
 		OrgUsrDto orgUsrDto = saveOrgUsrDynamicFormInstance(orgUsr, OrgUsrVo.getDynamicFormValue());
-
+		orgUsr.setSequenceNbr(orgUsrDto.getSequenceNbr());
 		/**
 		 * 同步保存ES
 		 */
@@ -1610,7 +1612,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	 */
 	@Override
 	public List<OrgUsr> getPersonListByParentId(Long id) {
-		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
 		wrapper.eq(OrgUsr::getIsDelete, false);
 		wrapper.eq(OrgUsr::getParentId, id);
 		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
@@ -1623,6 +1625,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	 * @param id
 	 * @return
 	 */
+	@Override
 	public List<OrgUsr> getPersonListByParentIds(List<String> ids) {
 		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
 		wrapper.eq(OrgUsr::getIsDelete, false);
@@ -1849,6 +1852,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		return allUnSyncCompanyList;
 	}
 
+	@Override
 	public OrgUsr getDetailById(Long id) {
 		LambdaQueryWrapper<OrgUsr> queryWrapper = new LambdaQueryWrapper<OrgUsr>();
 		queryWrapper.eq(OrgUsr::getIsDelete, false);