From 8b9fb576c8ca3eea3f36e6c96d3b24994051f399 Mon Sep 17 00:00:00 2001 From: miaowenbo <1670593359@qq.com> Date: Thu, 27 Nov 2025 16:11:11 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E8=8E=B7=E5=8F=96=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BB=8Ename=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=88=86=E9=83=A8=E9=97=A8=E7=BA=A7=E5=88=AB=E7=9A=84namePath?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/school/study/api/StudyCourseApi.java | 20 +++++++++++++------ .../service/impl/StudyCourseServiceImpl.java | 7 +++++-- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java index ad7f85f3..0eac17f7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/api/StudyCourseApi.java @@ -28,6 +28,7 @@ import com.xboe.school.study.dto.*; import com.xboe.school.study.entity.*; import com.xboe.school.study.service.*; import com.xboe.school.vo.StudyTimeVo; +import com.xboe.system.organization.entity.Organization; import com.xboe.system.organization.service.IOrganizationService; import com.xboe.system.user.entity.User; import com.xboe.system.user.service.IUserService; @@ -200,7 +201,9 @@ public class StudyCourseApi extends ApiBaseController{ ? userInfo.getUserNo() : ""); // 3. 填部门：通过departId查部门名称 - String departName = organizationService.getName(userInfo.getDepartId()); + // 获取部门信息（参考现有机构表，获取namePath字段） + Organization organization = organizationService.get(userInfo.getDepartId()); + String departName = organization != null ? organization.getNamePath() : ""; resultVo.setOrgInfo(StringUtils.isNotBlank(departName) ? departName : ""); @@ -418,7 +421,10 @@ public class StudyCourseApi extends ApiBaseController{ if (Objects.equals(userId, studyCourse1.getAid())) { log.info("【导出课程学习记录】查询boe人员表，机构id：{}", userInfo.getDepartId()); // 和技术沟通后，确认这里机构名称是redis获取的，获取不到返回null，因此正常遍历没有效率和空值问题 - studyCourse1.setOrgInfo(organizationService.getName(userInfo.getDepartId())); + // 获取部门信息（参考现有机构表，获取namePath字段） + Organization organization = organizationService.get(userInfo.getDepartId()); + String departName = organization != null ? organization.getNamePath() : ""; + studyCourse1.setOrgInfo(departName); // 取userNo为工号 studyCourse1.setUserNo(userInfo.getUserNo()); } @@ -1331,8 +1337,9 @@ public class StudyCourseApi extends ApiBaseController{ UserSimpleVo userSimpleVo = new UserSimpleVo(); userSimpleVo.setAid(userInfo.getId()); userSimpleVo.setCode(userInfo.getUserNo()); - // 获取部门信息 - String departName = organizationService.getName(userInfo.getDepartId()); + // 获取部门信息（参考现有机构表，获取namePath字段） + Organization organization = organizationService.get(userInfo.getDepartId()); + String departName = organization != null ? organization.getNamePath() : ""; userSimpleVo.setOrgInfo(StringUtils.isNotBlank(departName) ? departName : ""); userList.add(userSimpleVo); log.info("【资源学习情况导出-考试信息】查询boe人员表，用户id：{}", userId); @@ -1468,8 +1475,9 @@ public class StudyCourseApi extends ApiBaseController{ UserSimpleVo userSimpleVo = new UserSimpleVo(); userSimpleVo.setAid(userInfo.getId()); userSimpleVo.setCode(userInfo.getUserNo()); - // 获取部门信息 - String departName = organizationService.getName(userInfo.getDepartId()); + // 获取部门信息（参考现有机构表，获取namePath字段） + Organization organization = organizationService.get(userInfo.getDepartId()); + String departName = organization != null ? organization.getNamePath() : ""; userSimpleVo.setOrgInfo(StringUtils.isNotBlank(departName) ? departName : ""); userList.add(userSimpleVo); log.info("【资源学习情况导出-作业信息】查询boe人员表，用户id：{}", userId); diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java index b4e68749..3422c9a9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyCourseServiceImpl.java @@ -16,6 +16,7 @@ import com.xboe.school.study.entity.StudyCourseItem; import com.xboe.school.study.entity.StudySignup; import com.xboe.school.study.service.IStudyCourseService; import com.xboe.school.study.service.IStudySignupService; +import com.xboe.system.organization.entity.Organization; import com.xboe.system.organization.service.IOrganizationService; import com.xboe.system.user.entity.User; import com.xboe.system.user.service.IUserService; @@ -216,8 +217,10 @@ public class StudyCourseServiceImpl implements IStudyCourseService{ for (StudyCourse studyCourse1 : studyCourses) { if (Objects.equals(userId, studyCourse1.getAid())) { log.info("【分页查询课程学习记录】查询boe人员表，机构id：{}", userInfo.getDepartId()); - // 和技术沟通后，确认这里机构名称是redis获取的，获取不到返回null，因此正常遍历没有效率和空值问题 - studyCourse1.setOrgInfo(organizationService.getName(userInfo.getDepartId())); + // 获取部门信息（参考现有机构表，获取namePath字段） + Organization organization = organizationService.get(userInfo.getDepartId()); + String departName = organization != null ? organization.getNamePath() : ""; + studyCourse1.setOrgInfo(departName); // 取userNo为工号 studyCourse1.setUserNo(userInfo.getUserNo()); }