diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/ImsDutyEmergencyEntity.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/ImsDutyEmergencyEntity.java index 9316e16..9049ee1 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/ImsDutyEmergencyEntity.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service-api/hzinfo-inspect-service-api/src/main/java/org/springblade/hzinfo_inspect/duty/entity/ImsDutyEmergencyEntity.java @@ -48,7 +48,7 @@ public class ImsDutyEmergencyEntity extends BaseEntity { * 班次 */ @TableField(exist=false) - @ApiModelProperty(value = "班次") + @ApiModelProperty(value = "班次名称") private String dutyClassName; /** * 登记人 diff --git a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java index 5d30caf..6062d45 100644 --- a/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java +++ b/HZInfo-RIS-PXHD/hzinfo-ris-pxhd-service/hzinfo-inspect-service/src/main/java/org/springblade/hzinfo_inspect/duty/service/impl/ImsDutyEmergencyServiceImpl.java @@ -58,7 +58,6 @@ public class ImsDutyEmergencyServiceImpl extends ServiceImpl queryWrapper = getQueryWrapper(imsDutyEmergencyVo); - IPage imsDutyEmergencyEntityIPage = baseMapper.selectPage(Condition.getPage(query), queryWrapper); +// QueryWrapper queryWrapper = getQueryWrapper(imsDutyEmergencyVo); + IPage imsDutyEmergencyEntityIPage = baseMapper.selectPage(Condition.getPage(query), new LambdaQueryWrapper<>()); List records = imsDutyEmergencyEntityIPage.getRecords(); List collect; if (CollectionUtils.isNotEmpty(records)) {