Merge remote-tracking branch 'origin/dev_New' into dev_New

maven

2 天以前 6d5f8d5dd6f337837c7a0007639490afe3c7409c

Merge remote-tracking branch 'origin/dev_New' into dev_New

 src/main/java/com/ruoyi/staff/controller/PersonalAttendanceLocationConfigController.java

@@ -34,6 +34,12 @@
    @ApiOperation("新增/修改人员打卡规则配置")
    @PostMapping("/add")
    public R add(@RequestBody PersonalAttendanceLocationConfig personalAttendanceLocationConfig){


        // 班次需要不能够重复
        if (personalAttendanceLocationConfigService.lambdaQuery().eq(PersonalAttendanceLocationConfig::getShift, personalAttendanceLocationConfig.getShift()).one() != null) {
            return R.fail("班次不能重复");
        }
        return R.ok(personalAttendanceLocationConfigService.saveOrUpdate(personalAttendanceLocationConfig));
    }