Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

以房找人bug修改 --renpc

Browse Source
This commit is contained in:
Renpc-kilig 2025-05-30 16:53:51 +08:00
parent 9cbadd8147
commit f009edebe6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/cm/population/service/population/impl/PopulationServiceImpl.java
View File

@ -577,6 +577,8 @@ public class PopulationServiceImpl extends AbstractService implements IPopulatio
houseDTO -> houseDTO)); houseDTO -> houseDTO));
} }
populationInfoBaseDTOs.removeAll(Collections.singleton(null));
if (!CollectionUtils.isEmpty(populationInfoBaseDTOs)) { if (!CollectionUtils.isEmpty(populationInfoBaseDTOs)) {
baseMap = populationInfoBaseDTOs.stream() baseMap = populationInfoBaseDTOs.stream()
.collect(Collectors.toMap(PopulationInfoBaseDTO::getPopulationInfoId, .collect(Collectors.toMap(PopulationInfoBaseDTO::getPopulationInfoId,

6
src/main/resources/application-test.yml
View File

@ -62,7 +62,7 @@ swagger:
# 文件 # 文件
file: file:
uploadPath: D:\CF_work\ideaWorkSpace\uploadFiles\ uploadPath: E:\CF_work\ideaWorkSpace\uploadFiles\
imageTypes: png,jpg,jpeg,gif,blob imageTypes: png,jpg,jpeg,gif,blob
videoTypes: mp4 videoTypes: mp4
audioTypes: mp3,wav,amr audioTypes: mp3,wav,amr
@ -128,13 +128,13 @@ logging:
server-other: server-other:
area-url: http://192.168.0.15:7022/servicecity area-url: http://127.0.0.1:7022/servicecity
population-update-log: true population-update-log: true
population-insert-log: true population-insert-log: true
population-delete-log: false population-delete-log: false
camera: camera:
ffmpeg-path: D:\CF_work\ffmpeg\ffmpeg-2023-11-28-git-47e214245b-essentials_build\bin\ffmpeg.exe ffmpeg-path: E:\CF_work\ffmpeg\ffmpeg-2023-11-28-git-47e214245b-essentials_build\bin\ffmpeg.exe
rtmp-play: rtmp-play:
ip: 127.0.0.1 ip: 127.0.0.1
port: 8081 port: 8081