考勤

ruoyi-admin/src/main/java/com/ruoyi/web/controller/clock/ClockRecordController.java

@@ -94,7 +94,7 @@ public class ClockRecordController extends BaseController {
     @Log(title = "打卡记录", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ClockRecord clockRecord) {
-        return toAjax(clockRecordService.insertClockRecord(clockRecord));
+        return clockRecordService.insertClockRecord(clockRecord);
     }
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/IClockRecordService.java

@@ -37,7 +37,7 @@ public interface IClockRecordService
      * @param clockRecord 打卡记录
      * @return 结果
      */
-    public int insertClockRecord(ClockRecord clockRecord);
+    public AjaxResult insertClockRecord(ClockRecord clockRecord);
 
     /**
      * 修改打卡记录

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClockRecordServiceImpl.java

@@ -80,12 +80,12 @@ public class ClockRecordServiceImpl implements IClockRecordService {
      * @return 结果
      */
     @Override
-    public int insertClockRecord(ClockRecord clockRecord) {
+    public AjaxResult insertClockRecord(ClockRecord clockRecord) {
         SysUser user = SecurityUtils.getLoginUser().getUser();
         //判断当前人员是否能考勤
         ClockUserInfo clockUserInfo = clockUserInfoMapper.selectClockUserInfoByUserId(user.getUserId());
         if (clockUserInfo == null) {
-            throw new ServiceException("当前账号无法打卡");
+            return AjaxResult.success("当前账号无法打卡");
         }
         clockRecord.setUserId(user.getUserId());
         clockRecord.setUserName(user.getNickName());
@@ -102,7 +102,8 @@ public class ClockRecordServiceImpl implements IClockRecordService {
         }
         clockRecord.setSource("软件");
         clockRecord.setCreateTime(DateUtils.getNowDate());
-        return clockRecordMapper.insertClockRecord(clockRecord);
+        int rows = clockRecordMapper.insertClockRecord(clockRecord);
+        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**
@@ -144,6 +145,9 @@ public class ClockRecordServiceImpl implements IClockRecordService {
         Map<String, Object> resultMap = new HashMap<>();
         //查询人员数据
         ClockUserInfo clockUserInfo = clockUserInfoMapper.selectClockUserInfoByUserId(clockRecord.getUserId());
+        if(clockUserInfo==null){
+            return AjaxResult.error("无操作权限");
+        }
         resultMap.put("name", clockUserInfo.getUserName());
         //查询最新打卡数据
         ClockRecord clockRecordNew = clockRecordMapper.selectClockRecordNew(clockRecord);