Merge remote-tracking branch 'origin/fb_jxiop_V1.1.0_230316' into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/CompanyTreeDto.java

@@ -18,4 +18,7 @@ public class CompanyTreeDto {
     private String level;
 
     private List<CompanyTreeDto> children;
+
+    private boolean disabled;
+
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HouseholdPvDistrictServiceImpl.java

@@ -43,6 +43,7 @@ public class HouseholdPvDistrictServiceImpl extends BaseService<HouseholdPvDistr
     @Autowired
     HouseholdPvDistrictMapper householdPvDistrictMapper;
 
+    static final String STATION_LEVEL = "level";
     /**
      * 分页查询
      */
@@ -161,7 +162,12 @@ public class HouseholdPvDistrictServiceImpl extends BaseService<HouseholdPvDistr
             BeanUtils.copyProperties(item, dto, "children");
             Map<String, Object> detail = (Map<String, Object>) item.getObject();
             if (!ObjectUtils.isEmpty(detail)) {
-                dto.setLevel(detail.getOrDefault("level", "").toString());
+                dto.setLevel(detail.getOrDefault(STATION_LEVEL, "").toString());
+                if (!ObjectUtils.isEmpty(detail.get(STATION_LEVEL)) && "station".equals(detail.get(STATION_LEVEL))){
+                    dto.setDisabled(false);
+                }else {
+                    dto.setDisabled(true);
+                }
             }
             result.add(dto);
             if (!ObjectUtils.isEmpty(item.getChildren())) {

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/HouseholdPvServiceImpl.java

@@ -223,6 +223,9 @@ public class HouseholdPvServiceImpl extends BaseService<HouseholdPvDto, Househol
 			if (dto.getServiceAddress().length() > 200) {
 				return "第" + line + " 行送达地址最多输入200个字符！";
 			}
+			if (dto.getResidenceAddress().length() > 400) {
+				return "第" + line + " 户籍地址最多输入400个字符！";
+			}
 
 			LambdaQueryWrapper<HouseholdPvDistrict> orgLambda = new QueryWrapper<HouseholdPvDistrict>().lambda();
 			orgLambda.likeRight(HouseholdPvDistrict::getBizOrgCode, orgCodeMap.get(dto.getPlatformCompanyId()));