|
|
@@ -8,6 +8,8 @@ import com.uas.sso.sso.backend.dto.UpdateUserInfo;
|
|
|
import com.uas.sso.sso.backend.service.UserBackendService;
|
|
|
import com.uas.sso.sso.backend.support.ResultBean;
|
|
|
import java.util.List;
|
|
|
+import java.util.Optional;
|
|
|
+
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Pageable;
|
|
|
import org.springframework.http.MediaType;
|
|
|
@@ -45,7 +47,7 @@ public class UserManageController {
|
|
|
@RequestParam(required = false) String keyword) {
|
|
|
// Controller中的Pageable类型参数默认根据查询参数 page 和 size 注入并实例化
|
|
|
return new ResultBean<>(
|
|
|
- userBackendService.showUserByPagination(page, fromApp, mobileValidCode, identityValidCode, key, keyword));
|
|
|
+ userBackendService.showUserByPagination(page, fromApp, mobileValidCode, identityValidCode, key, Optional.ofNullable(keyword).map(String::trim).orElse(null)));
|
|
|
}
|
|
|
|
|
|
@RequestMapping(method = RequestMethod.GET, path = "//showEnUserByPagination",
|