diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java index 0cc7342b..9afaed79 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/domain/vo/project/BusProjectVo.java @@ -230,7 +230,7 @@ public class BusProjectVo implements Serializable { /** * 所属部门列表 */ - private List deptIds; + private Long deptIds; /** * 部门列表 @@ -240,7 +240,7 @@ public class BusProjectVo implements Serializable { /** * 部门名称列表 */ - @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptStr") + @Translation(type = TransConstant.DEPT_ID_TO_NAME, mapper = "deptIds") private String deptNames; /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java index b0d92c90..d5c5ab16 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusProjectServiceImpl.java @@ -574,7 +574,7 @@ public class BusProjectServiceImpl extends ServiceImpl deptList = projectDeptService.lambdaQuery() + BusProjectDept dept = projectDeptService.lambdaQuery() .eq(BusProjectDept::getProjectId, project.getId()) - .list(); - List deptIds = deptList.stream().map(BusProjectDept::getDeptId).toList(); - projectVo.setDeptIds(deptIds); - if (CollUtil.isNotEmpty(deptIds)) { - String deptStr = deptIds.stream().map(String::valueOf).collect(Collectors.joining(",")); - projectVo.setDeptStr(deptStr); + .last("limit 1") + .one(); + if (dept != null) { + projectVo.setDeptIds(dept.getDeptId()); + projectVo.setDeptStr(dept.toString()); } return projectVo; }