Browse Source

修复续建项目列表查询报错

tags/24080901
WendyYang 1 year ago
parent
commit
db690769ec
2 changed files with 5 additions and 2 deletions
  1. +4
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java
  2. +1
    -1
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml

+ 4
- 1
pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java View File

@@ -216,7 +216,7 @@ public class ExpertExportManage {
experts.forEach(w -> { experts.forEach(w -> {
ExpertInfoDTO expert = new ExpertInfoDTO(); ExpertInfoDTO expert = new ExpertInfoDTO();
if (ExpertAttendStatusEnum.ON_LEAVE.eq(w.getStatus())) { if (ExpertAttendStatusEnum.ON_LEAVE.eq(w.getStatus())) {
expert.setBank(w.getExpertName() + "(请假)");
expert.setName(w.getExpertName() + "(请假)");
} else { } else {
expert.setName(w.getExpertName()); expert.setName(w.getExpertName());
} }
@@ -224,6 +224,9 @@ public class ExpertExportManage {
if (expertUser != null) { if (expertUser != null) {
expert.setCompany(expertUser.getCompany()); expert.setCompany(expertUser.getCompany());
expert.setJob(expertUser.getAdministrativeDuties()); expert.setJob(expertUser.getAdministrativeDuties());
} else {
expert.setCompany(StrUtil.EMPTY);
expert.setJob(StrUtil.EMPTY);
} }
data.getExperts().add(expert); data.getExperts().add(expert);
}); });


+ 1
- 1
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/mapper/ProjectRenewalFundDeclarationMapper.xml View File

@@ -75,7 +75,7 @@
</foreach> </foreach>
</if> </if>
<if test="param.userRegionCode != null"> <if test="param.userRegionCode != null">
and prfd.region_code = param.userRegionCode}
and prfd.region_code = #{param.userRegionCode}
</if> </if>
</if> </if>
order by prfd.update_on desc order by prfd.update_on desc


Loading…
Cancel
Save