Merge branch 'dev' of GameCenter/game-center into master

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/controller/RoleAssignController.java

@@ -46,7 +46,7 @@ public class RoleAssignController {
     }
 
     @ApiOperation(value = "指派记录删除")
-    @DeleteMapping(value = "/delete/id")
+    @DeleteMapping(value = "/delete/{id}")
     @PreAuthorize(permissionKey = "manage:roleAssign:delete")
     public ResultVO<Boolean> deleteById(@PathVariable Long id) {
         return ResultVO.ok(roleAssignRecordService.deleteById(id));

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/RoleAssignRecordServiceImpl.java

@@ -276,7 +276,7 @@ public class RoleAssignRecordServiceImpl extends ServiceImpl<RoleAssignRecordMap
                 .eq(RoleAssignRecord::getServerId, item.getServerId())
                 .eq(RoleAssignRecord::getUserId, item.getUserId())
                 .eq(RoleAssignRecord::getRoleId, item.getRoleId())
-                .le(RoleAssignRecord::getStartTime, startTime)
+                .lt(RoleAssignRecord::getStartTime, startTime)
                 .orderByDesc(RoleAssignRecord::getStartTime)
                 .eq(RoleAssignRecord::getIsDelete, 0)
                 .last("limit 1"));
@@ -294,7 +294,7 @@ public class RoleAssignRecordServiceImpl extends ServiceImpl<RoleAssignRecordMap
                 .eq(RoleAssignRecord::getServerId, item.getServerId())
                 .eq(RoleAssignRecord::getUserId, item.getUserId())
                 .eq(RoleAssignRecord::getRoleId, item.getRoleId())
-                .ge(RoleAssignRecord::getStartTime, startTime)
+                .gt(RoleAssignRecord::getStartTime, startTime)
                 .orderByAsc(RoleAssignRecord::getStartTime)
                 .eq(RoleAssignRecord::getIsDelete, 0)
                 .last("limit 1")