diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProjectManagement.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProjectManagement.java index 086901da..842e8621 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProjectManagement.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiProjectManagement.java @@ -52,6 +52,9 @@ public class BsSgcJsjdBuiProjectManagement extends BaseEntity @ApiModelProperty("职务") private String post; + /** 所属单位 */ + private String belowUnit; + @TableField(exist = false) Listchildren; } diff --git a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSectionExcel.java b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSectionExcel.java index baf51dc1..25dd0d5b 100644 --- a/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSectionExcel.java +++ b/jwtech-system/src/main/java/com/kms/build/domain/BsSgcJsjdBuiSectionExcel.java @@ -21,12 +21,12 @@ public class BsSgcJsjdBuiSectionExcel { /** 项目法人 */ @Excel(name = "项目法人") @ApiModelProperty("项目法人") - private String projectLegalPerson; + private String projectunitLegal; /** 单位法定代表人电话 */ @Excel(name = "法定代表人电话") @ApiModelProperty("法定代表人电话") - private String projectUnitLegalPhone; + private String projectsuperinteidentPhone; /** 工程等别 */ diff --git a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java index eb6e2c65..c60419b0 100644 --- a/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java +++ b/jwtech-system/src/main/java/com/kms/build/service/BsSgcJsjdBuiEnteInfoService.java @@ -1,5 +1,6 @@ package com.kms.build.service; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.jianwei.common.core.domain.AjaxResult; import com.kms.build.domain.BsSgcJsjdBuiEnteInfo; @@ -49,12 +50,10 @@ public class BsSgcJsjdBuiEnteInfoService extends BaseService bsSgcJsjdBuiEnteInfos = bsSgcJsjdBuiEnteInfoMapper.selectList(queryWrapper); - proInfo.setEnterpriseInfoList(bsSgcJsjdBuiEnteInfos); - - + if (ObjectUtil.isNotEmpty(bsSgcJsjdBuiEnteInfos)) { + proInfo.setEnterpriseInfoList(bsSgcJsjdBuiEnteInfos); + } return AjaxResult.success(proInfo); - - } }