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

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/pojo/dto/RoleLevelParamDTO.java

@@ -71,6 +71,9 @@ public class RoleLevelParamDTO extends BasePage {
    @ApiModelProperty(value = "运营id")
    private Long operUserId;
 
+   @ApiModelProperty(value = "备注")
+   private String remark;
+
    @ApiModelProperty(notes = "排序字段")
    private String sortFiled;
 

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -1625,6 +1625,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
         if (dto.getLevelTimeMin() != null && dto.getLevelTimeMax() != null) {
             criA.where().andBetween("a.level_time", dto.getLevelTimeMin().atTime(LocalTime.MIN), dto.getLevelTimeMax().atTime(LocalTime.MAX));
         }
+        if(StringUtils.isNotEmpty(dto.getRemark())){
+            criA.where().andLike("b.remark",dto.getRemark());
+        }
 
         return criA;
     }
@@ -1644,6 +1647,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                       a.role_level          as roleLevel,
                       a.level_time          as levelTime,
                       a.agent_id            as agentId,
+                      a.import_user as importUser,
                       b.gs_id               as gsId,
                       b.customer_service_id as customerServiceId,
                       b.oper_user_id        as operUserId,
@@ -1690,6 +1694,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         b.gs_id               as gsId,
                         b.customer_service_id as customerServiceId,
                         b.oper_user_id        as operUserId,
+                           b.remark as remark,
                         c.pitcher_id          as pitcherId,
                         d.ip,
                         d.ip_count,