From 5c23f64936f3a43a47254fd622b394afaa683506 Mon Sep 17 00:00:00 2001 From: pengwei Date: Mon, 27 Oct 2025 11:00:02 +0800 Subject: [PATCH] =?UTF-8?q?fiex:=E4=BA=BA=E5=91=98=E6=8A=BD=E6=A3=80?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProfileDepartController.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java index 87dfa05..49b97bb 100644 --- a/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java +++ b/src/main/java/com/biutag/supervision/controller/sensitiveperception/ProfileDepartController.java @@ -1,8 +1,10 @@ package com.biutag.supervision.controller.sensitiveperception; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -77,10 +79,12 @@ public class ProfileDepartController { ProfileDepart profileDepart = new ProfileDepart(); profileDepart.setDays(DateUtil.between(beginTime, endTime, DateUnit.DAY)); SupDepart depart = departService.getById(departId); - profileDepart.getDepartInfo() - .setName(depart.getShortName()) - .setShortName(depart.getShortName()) - .setDepartImg(depart.getImg()); + if(ObjectUtil.isNotEmpty(depart)){ + profileDepart.getDepartInfo() + .setName(depart.getShortName()) + .setShortName(depart.getShortName()) + .setDepartImg(depart.getImg()); + } List polices = policeService.listAllByDepartId(departId); profileDepart.getDepartInfo().setMainRole(polices.stream().filter(item -> "正职".equals(item.getPosition())).findFirst().map(SupPolice::getName).orElse(null)); profileDepart.getDepartInfo().setDeputyRole(polices.stream().filter(item -> "副职".equals(item.getPosition())).map(SupPolice::getName).toList()); @@ -91,9 +95,11 @@ public class ProfileDepartController { List negativeIds = list.stream().map(NegativeScoreDepart::getNegativeId).toList(); SupDepartPoliceSize policeSize = departPoliceSizeService.getById(departId); - profileDepart.getDepartInfo().setPoliceSize(policeSize.getPoliceSize()); - profileDepart.getDepartInfo().setAuxSize(policeSize.getAuxSize()); + if(ObjectUtil.isNotEmpty(policeSize)){ + profileDepart.getDepartInfo().setPoliceSize(policeSize.getPoliceSize() == null?policeSize.getPoliceSize():0L); + profileDepart.getDepartInfo().setAuxSize(policeSize.getAuxSize() == null?policeSize.getAuxSize():0L); + } if (negativeIds.isEmpty()) { return Result.success(profileDepart); }