勤务模块

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendancePostRecordController.java

@@ -125,12 +125,24 @@ public class AttendancePostRecordController extends BaseController {
         Long currentUserId = SecurityUtils.getUserId();
         // 计算当前时间对应的班次日期
 //        Date queryDate = determineShiftDate();
-        Date queryDate = attendancePostRecordService.selectMaxDateByUserId(currentUserId, null);
+        Long createBy = null;
+        Long userId = null;
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case DEPARTMENT:
+            case TEAM:
+                createBy = currentUserId;
+                break;
+            default:
+                userId = currentUserId;
+                break;
+        }
+        Date queryDate = attendancePostRecordService.selectMaxDateByUserId(createBy, userId);
         if (queryDate == null) {
             queryDate = DateUtils.getNowDate();
         }
         // 先获取当前用户今天的记录，取出班次信息
-        List<AttendancePostRecord> userRecords = attendancePostRecordService.selectTodayRecordsByUserId(currentUserId, null, queryDate);
+        List<AttendancePostRecord> userRecords = attendancePostRecordService.selectTodayRecordsByUserId(createBy, userId, queryDate);
 
         if (userRecords.isEmpty()) {
             return AjaxResult.success(new ArrayList<>());

airport-admin/src/main/java/com/sundot/airport/web/controller/attendance/AttendanceTeamUserRecordController.java

@@ -4,6 +4,8 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.sundot.airport.common.core.domain.DataPermissionResult;
+import com.sundot.airport.web.core.utils.DataPermissionUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -55,7 +57,14 @@ public class AttendanceTeamUserRecordController extends BaseController {
     @PreAuthorize("@ss.hasPermi('attendance:record:list')")
     @GetMapping("/list")
     public AjaxResult list(AttendanceTeamUserRecord attendanceTeamUserRecord) {
-        attendanceTeamUserRecord.setCreateBy(getUsername());
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case TEAM:
+                attendanceTeamUserRecord.setCreateBy(getUsername());
+                break;
+            default:
+                break;
+        }
         attendanceTeamUserRecord.setCheckInType("1");
         List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord, true);
         return success(list);
@@ -71,7 +80,14 @@ public class AttendanceTeamUserRecordController extends BaseController {
         if (attendanceTeamUserRecord == null) {
             attendanceTeamUserRecord = new AttendanceTeamUserRecord();
         }
-        attendanceTeamUserRecord.setCreateBy(getUsername());
+        DataPermissionResult dataPermission = DataPermissionUtils.getDataPermission(getUserId(), getDeptId(), getLoginUser());
+        switch (dataPermission.getPermissionType()) {
+            case TEAM:
+                attendanceTeamUserRecord.setCreateBy(getUsername());
+                break;
+            default:
+                break;
+        }
         attendanceTeamUserRecord.setCheckInType("1");
         List<AttendanceTeamUserRecord> list = attendanceTeamUserRecordService.selectAttendanceTeamUserRecordList(attendanceTeamUserRecord, true);
         ExcelUtil<AttendanceTeamUserRecord> util = new ExcelUtil<AttendanceTeamUserRecord>(AttendanceTeamUserRecord.class);