|
@@ -9,22 +9,23 @@ public class OverallParam {
|
|
private Long pageNum = 1L;
|
|
private Long pageNum = 1L;
|
|
private Long pageSize = 10L;
|
|
private Long pageSize = 10L;
|
|
private String searchKey;
|
|
private String searchKey;
|
|
|
|
+ private String userId;
|
|
|
|
|
|
|
|
|
|
private String sceneName;
|
|
private String sceneName;
|
|
private String userName;
|
|
private String userName;
|
|
|
|
|
|
public String getSearchKey() {
|
|
public String getSearchKey() {
|
|
- if(StringUtils.isNotBlank(sceneName) && StringUtils.isNotBlank(userName)){
|
|
|
|
- return sceneName + userName;
|
|
|
|
- }
|
|
|
|
if(StringUtils.isNotBlank(sceneName)){
|
|
if(StringUtils.isNotBlank(sceneName)){
|
|
return sceneName;
|
|
return sceneName;
|
|
}
|
|
}
|
|
|
|
+ return searchKey;
|
|
|
|
+ }
|
|
|
|
+ public String getUserId() {
|
|
if(StringUtils.isNotBlank(userName)){
|
|
if(StringUtils.isNotBlank(userName)){
|
|
return userName;
|
|
return userName;
|
|
}
|
|
}
|
|
- return null;
|
|
|
|
|
|
+ return userId;
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|