diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/commonlyused/CommonlyUsedController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/commonlyused/CommonlyUsedController.java index 7be32680..3a3b805f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/commonlyused/CommonlyUsedController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/commonlyused/CommonlyUsedController.java @@ -38,14 +38,12 @@ public class CommonlyUsedController { @PostMapping("/create") @Operation(summary = "创建用户常用应用配置") - @PreAuthorize("@ss.hasPermission('system:commonly-used:create')") public CommonResult createCommonlyUsed(@Valid @RequestBody CommonlyUsedSaveReqVO createReqVO) { return success(commonlyUsedService.createCommonlyUsed(createReqVO)); } @PostMapping("/batchCreateOrEditOrDel") @Operation(summary = "批量创建编辑删除用户常用应用配置") - @PreAuthorize("@ss.hasPermission('system:commonly-used:create')") public CommonResult batchCreateOrEditOrDel(@Valid @RequestBody List list) { commonlyUsedService.batchCreateOrEditOrDel(list); return success(true); @@ -53,7 +51,6 @@ public class CommonlyUsedController { @PutMapping("/update") @Operation(summary = "更新用户常用应用配置") - @PreAuthorize("@ss.hasPermission('system:commonly-used:update')") public CommonResult updateCommonlyUsed(@Valid @RequestBody CommonlyUsedSaveReqVO updateReqVO) { commonlyUsedService.updateCommonlyUsed(updateReqVO); return success(true); @@ -61,7 +58,6 @@ public class CommonlyUsedController { @PutMapping("/batchUpdate") @Operation(summary = "批量更新用户常用应用配置") - @PreAuthorize("@ss.hasPermission('system:commonly-used:update')") public CommonResult batchUpdate(@Valid @RequestBody List list) { commonlyUsedService.batchUpdate(list); return success(true); @@ -70,7 +66,6 @@ public class CommonlyUsedController { @DeleteMapping("/delete") @Operation(summary = "删除用户常用应用配置") @Parameter(name = "id", description = "编号", required = true) - @PreAuthorize("@ss.hasPermission('system:commonly-used:delete')") public CommonResult deleteCommonlyUsed(@RequestParam("id") Long id) { commonlyUsedService.deleteCommonlyUsed(id); return success(true); @@ -78,7 +73,6 @@ public class CommonlyUsedController { @DeleteMapping("/batchDelete") @Operation(summary = "批量删除用户常用应用配置") - @PreAuthorize("@ss.hasPermission('system:commonly-used:delete')") public CommonResult batchDelete(@RequestBody List ids) { commonlyUsedService.batchDelete(ids); return success(true); @@ -87,7 +81,6 @@ public class CommonlyUsedController { @GetMapping("/get") @Operation(summary = "获得用户常用应用配置") @Parameter(name = "id", description = "编号", required = true, example = "1024") - @PreAuthorize("@ss.hasPermission('system:commonly-used:query')") public CommonResult getCommonlyUsed(@RequestParam("id") Long id) { CommonlyUsedDO commonlyUsed = commonlyUsedService.getCommonlyUsed(id); return success(BeanUtils.toBean(commonlyUsed, CommonlyUsedRespVO.class)); @@ -95,7 +88,6 @@ public class CommonlyUsedController { @GetMapping("/list") @Operation(summary = "获得用户常用应用配置列表") - @PreAuthorize("@ss.hasPermission('system:commonly-used:query')") public CommonResult getCommonlyUsedList() { CommonlyUsedVO vo = commonlyUsedService.getCommonlyUsedList(); return success(vo); @@ -103,7 +95,6 @@ public class CommonlyUsedController { @GetMapping("/export-excel") @Operation(summary = "导出用户常用应用配置 Excel") - @PreAuthorize("@ss.hasPermission('system:commonly-used:export')") @OperateLog(type = EXPORT) public void exportCommonlyUsedExcel(@Valid CommonlyUsedPageReqVO pageReqVO, HttpServletResponse response) throws IOException { 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 013ee777..6084308a 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 @@ -1025,14 +1025,23 @@ public class AttendanceServiceImpl implements AttendanceService { //先减去补卡次数 this.useReplacementCardNum(userId); try { - int update = attendancePunchRecordMapper.update(new AttendancePunchRecordDO().setStatus(AttendanceOnTheDayDTO.REPLACEMENT_CARD), - new LambdaQueryWrapper() - .eq(AttendancePunchRecordDO::getUserId, userId) - .eq(AttendancePunchRecordDO::getAttendanceGroupShiftItemId, dto.getAttendanceGroupShiftItemId()) - .eq(AttendancePunchRecordDO::getWorkType, dto.getWorkType()) - .eq(AttendancePunchRecordDO::getActualDayTime, dto.getActualDayTime()) - .eq(AttendancePunchRecordDO::getStatus, AttendanceOnTheDayDTO.PUNCH_STATUS_MISS)); - if (update <= 0) { + // -- 找到这条缺卡记录 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper() + .eq(AttendancePunchRecordDO::getUserId, userId) + .eq(AttendancePunchRecordDO::getAttendanceGroupShiftItemId, dto.getAttendanceGroupShiftItemId()) + .eq(AttendancePunchRecordDO::getWorkType, dto.getWorkType()) + .eq(AttendancePunchRecordDO::getActualDayTime, dto.getActualDayTime()) + .eq(AttendancePunchRecordDO::getStatus, AttendanceOnTheDayDTO.PUNCH_STATUS_MISS); + + List list = attendancePunchRecordMapper.selectList(lambdaQueryWrapper); + int update = 0; + if (CollectionUtil.isNotEmpty(list)) { + AttendancePunchRecordDO attendancePunchRecordDO = list.get(0); + attendancePunchRecordDO.setStatus(AttendanceOnTheDayDTO.REPLACEMENT_CARD); + attendancePunchRecordDO.setPunchTime(attendancePunchRecordDO.getShouldPunchTime()); + update = attendancePunchRecordMapper.updateById(attendancePunchRecordDO); + } + if (CollectionUtil.isEmpty(list) || update <= 0) { throw exception(CANNOT_FIND_THE_RECORD_THAT_NEEDS_TO_BE_REPLACED); } } catch (Exception e) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/commonlyused/CommonlyUsedServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/commonlyused/CommonlyUsedServiceImpl.java index cb134004..50d1b7e8 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/commonlyused/CommonlyUsedServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/commonlyused/CommonlyUsedServiceImpl.java @@ -118,7 +118,7 @@ public class CommonlyUsedServiceImpl implements CommonlyUsedService { List menus = map.get("2" + "_" + menuDO.getId()); CommonlyUsedDO commonlyUsedDO = menus.get(0); CommonlyUsedRespVO commonlyUsedRespVO = BeanUtil.copyProperties(commonlyUsedDO, CommonlyUsedRespVO.class); - commonlyUsedRespVO.setImg(menuDO.getIcon()); + commonlyUsedRespVO.setImg(menuDO.getImg()); commonlyUsedRespVO.setName(menuDO.getName()); // -- 这里的路由需要拼接 List routingList = new ArrayList<>();