Browse Source

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

zhimo 11 months ago
parent
commit
28ec1fedbd

+ 1 - 1
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/ManageApplication.java

@@ -23,7 +23,7 @@ public class ManageApplication {
 
     public static void main(String[] args) {
         SpringApplication.run(ManageApplication.class, args);
-        System.out.println("赞象Manage服务启动成功 < (新增游戏和区服rpc接口01´・・)ノ(._.`) \n" +
+        System.out.println("赞象Manage服务启动成功 < (角色授权分组接口修改´・・)ノ(._.`) \n" +
                 "___  ___  ___   _   _   ___  _____  _____ \n" +
                 "|  \\/  | / _ \\ | \\ | | / _ \\|  __ \\|  ___|\n" +
                 "| .  . |/ /_\\ \\|  \\| |/ /_\\ \\ |  \\/| |__  \n" +

+ 9 - 0
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/params/GameAuthRoleGroupListParam.java

@@ -5,6 +5,8 @@ import com.zanxiang.module.web.pojo.BaseListDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author : lingfeng
  * @time : 2024-05-21
@@ -13,6 +15,13 @@ import lombok.Data;
 @Data
 public class GameAuthRoleGroupListParam extends BaseListDTO<GameAuthRoleGroup> {
 
+    /**
+     * 分组id
+     */
+    @NotNull(message = "分组id不可为空")
+    @ApiModelProperty(notes = "分组id, 必传")
+    private Long groupId;
+
     /**
      * 用户id
      */

+ 1 - 0
game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameAuthRoleGroupServiceImpl.java

@@ -43,6 +43,7 @@ public class GameAuthRoleGroupServiceImpl extends ServiceImpl<GameAuthRoleGroupM
     @Override
     public IPage<GameAuthRoleGroupVO> listOfPage(GameAuthRoleGroupListParam param) {
         IPage<GameAuthRoleGroupVO> gameAuthRoleGroupPage = page(param.toPage(), new QueryWrapper<GameAuthRoleGroup>().lambda()
+                .eq(GameAuthRoleGroup::getGroupId, param.getGroupId())
                 .eq(param.getUserId() != null, GameAuthRoleGroup::getUserId, param.getUserId())
                 .eq(param.getIsLeader() != null, GameAuthRoleGroup::getIsLeader, param.getIsLeader())
                 .orderByDesc(GameAuthRoleGroup::getCreateTime)