diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesVolumeCatalogController.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesVolumeCatalogController.java index e46ee637..4e068dca 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesVolumeCatalogController.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/design/controller/DesVolumeCatalogController.java @@ -17,12 +17,15 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.design.domain.DesVolumeFile; +import org.dromara.design.domain.bo.DesUserBo; import org.dromara.design.domain.dto.ExcelData; import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogCreateReq; import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogQueryReq; import org.dromara.design.domain.dto.volumecatalog.DesVolumeCatalogUpdateReq; +import org.dromara.design.domain.vo.DesUserVo; import org.dromara.design.domain.vo.volumecatalog.DesVolumeCatalogVo; import org.dromara.design.domain.vo.volumefile.DesVolumeFileVo; +import org.dromara.design.service.IDesUserService; import org.dromara.design.service.IDesVolumeCatalogService; import org.dromara.design.service.IDesVolumeFileService; import org.springframework.validation.annotation.Validated; @@ -38,6 +41,7 @@ import java.time.ZoneId; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 卷册目录 @@ -56,6 +60,8 @@ public class DesVolumeCatalogController extends BaseController { @Resource private IDesVolumeFileService volumeFileService; + @Resource + private IDesUserService desUserService; /** @@ -161,6 +167,25 @@ public class DesVolumeCatalogController extends BaseController { } + + /** + * 查询设计人员列表 + */ + @SaCheckPermission("design:volumeCatalog:majorList") + @GetMapping("/majorList") + public R> list(DesUserBo bo) { + + List desUserVos = desUserService.queryList(bo); + List uniqueMajors = new ArrayList<>(desUserVos.stream() + .collect(Collectors.toMap( + DesUserVo::getUserMajor, + user -> user, + (existing, replacement) -> existing + )) + .values()); + return R.ok(uniqueMajors); + } + public static List readExcel(MultipartFile file) throws IOException { List dataList = new ArrayList<>();