From c38622562d834b336dc0592c6e96f77b877edea5 Mon Sep 17 00:00:00 2001 From: aikai Date: Thu, 30 May 2024 18:52:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E7=99=BB?= =?UTF-8?q?=E9=99=86=E7=94=A8=E6=88=B7=E6=89=80=E5=9C=A8=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E7=BB=84=E5=B9=B6=E4=B8=94=E6=98=AF=E5=90=A6=E6=9C=89=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=91=98=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/attendance/AttendanceController.java | 8 ++++++++ .../attendance/vo/AttendanceGroupSystemVO.java | 17 +++++++++++++++++ .../service/attendance/AttendanceService.java | 6 ++++++ .../attendance/AttendanceServiceImpl.java | 11 +++++++++++ 4 files changed, 42 insertions(+) create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/vo/AttendanceGroupSystemVO.java diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/AttendanceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/AttendanceController.java index cf1ac79c..a717ca56 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/AttendanceController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/AttendanceController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.util.List; import java.util.Map; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @@ -64,4 +65,11 @@ public class AttendanceController { TeamAttendanceStatisticsByCycleVO map = attendanceService.tesmStatisticsByCycle(dto); return success(map); } + + @GetMapping("/getTheAttendanceGroupToWhichTheCurrentlyLoggedInUserBelongsAndWhetherTheyHaveAdministratorRights") + @Operation(summary = "获取当前登陆用户所在考勤组并且是否有管理员权限") + public CommonResult getTheAttendanceGroupToWhichTheCurrentlyLoggedInUserBelongsAndWhetherTheyHaveAdministratorRights() { + AttendanceGroupSystemVO vo = attendanceService.getTheAttendanceGroupToWhichTheCurrentlyLoggedInUserBelongsAndWhetherTheyHaveAdministratorRights(); + return success(vo); + } } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/vo/AttendanceGroupSystemVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/vo/AttendanceGroupSystemVO.java new file mode 100644 index 00000000..4eab67fe --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/app/attendance/vo/AttendanceGroupSystemVO.java @@ -0,0 +1,17 @@ +package cn.iocoder.yudao.module.system.controller.app.attendance.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.experimental.Accessors; + +@Data +@Accessors(chain = true) +public class AttendanceGroupSystemVO { + + @Schema(description = "考勤组id") + private Long groupId; + + @Schema(description = "是否有权限 true是 false否") + private Boolean flag; + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceService.java index 78b09739..e0a8aff3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceService.java @@ -82,4 +82,10 @@ public interface AttendanceService { * @return */ TeamAttendanceStatisticsByCycleVO tesmStatisticsByCycle(TeamAttendanceStatisticsByCycleDTO dto); + + /** + * 获取当前登录用户所属的考勤组以及是否具有管理员权限 + * @return + */ + AttendanceGroupSystemVO getTheAttendanceGroupToWhichTheCurrentlyLoggedInUserBelongsAndWhetherTheyHaveAdministratorRights(); } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java index 17756431..9e2f8a96 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/attendance/AttendanceServiceImpl.java @@ -50,6 +50,7 @@ import java.util.stream.Collectors; import static cn.hutool.core.date.DateUtil.dayOfWeekEnum; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; +import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*; /** @@ -708,6 +709,16 @@ public class AttendanceServiceImpl implements AttendanceService { return vo; } + @Override + public AttendanceGroupSystemVO getTheAttendanceGroupToWhichTheCurrentlyLoggedInUserBelongsAndWhetherTheyHaveAdministratorRights() { + Long userId = getLoginUserId(); + AttendanceGroupDO attendanceGroupDO = attendanceGroupService.getByUserId(userId); + if (attendanceGroupDO != null) { + return new AttendanceGroupSystemVO().setGroupId(attendanceGroupDO.getId()).setFlag(attendanceGroupDO.getUserId().equals(userId)); + } + return null; + } + /** * 外勤计算 *