From 4780a3ac4a163ea0181d395488042ec443403f62 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期三, 21 六月 2023 18:28:52 +0800 Subject: [PATCH] BUG修复和营销统计 --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java | 29 +++++++++++++++++++++++++++-- 1 files changed, 27 insertions(+), 2 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java index c10055e..36700ed 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java @@ -1,13 +1,18 @@ package com.ruoyi.system.controller.conslole; import com.ruoyi.common.core.domain.R; +import com.ruoyi.system.api.domain.dto.MgtUserIdByDept; +import com.ruoyi.system.api.domain.poji.config.Activeness; import com.ruoyi.system.api.domain.poji.config.SysClassification; import com.ruoyi.system.api.domain.poji.config.SysTag; -import com.ruoyi.system.api.domain.poji.config.Activeness; import com.ruoyi.system.service.config.ActivenessService; import com.ruoyi.system.service.config.SysClassificationService; import com.ruoyi.system.service.config.SysTagService; -import org.springframework.web.bind.annotation.*; +import com.ruoyi.system.service.sys.ISysUserService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; @@ -32,6 +37,11 @@ @Resource private SysClassificationService sysClassificationService; + + @Resource + private ISysUserService sysUserService; + + /** * 获取系统标签 @@ -89,4 +99,19 @@ Map<Long,SysClassification> sysClassificationMap = sysClassificationService.getSysClassificationList(classIds); return R.ok(sysClassificationMap); } + + /** + * @description 获取部门用户 + * @author jqs + * @date 2023/6/21 16:00 + * @param userIdByDept + * @return R<MgtShopIdByCodeDto> + */ + @PostMapping("/getUserIdByDept") + public R<MgtUserIdByDept> getUserIdByDept(@RequestBody MgtUserIdByDept userIdByDept) + { + userIdByDept = sysUserService.getUserIdByDept(userIdByDept); + return R.ok(userIdByDept); + } + } -- Gitblit v1.7.1