Browse Source

输入框关键字去除前后空格

wangmh 7 years ago
parent
commit
e6b4796e47

+ 3 - 1
sso-manage-console/src/main/java/com/uas/sso/sso/backend/api/AppealBackendController.java

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Optional;
+
 /**
  * Api interface implementations for managing appeal.
  *
@@ -39,7 +41,7 @@ public class AppealBackendController {
             @RequestParam(required = false) String keyword) {
 
         return new ResultBean<>(
-                appealService.showAppealsByPagination(page, type, fromApp, status, key, keyword));
+                appealService.showAppealsByPagination(page, type, fromApp, status, key, Optional.ofNullable(keyword).map(String::trim).orElse(null)));
     }
 
     @RequestMapping(method = RequestMethod.PUT, path = "/{appealId}/approveAppealRequest",

+ 3 - 1
sso-manage-console/src/main/java/com/uas/sso/sso/backend/api/UserManageController.java

@@ -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",

+ 2 - 1
sso-manage-console/src/main/java/com/uas/sso/sso/backend/api/UserSpaceManageController.java

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Optional;
 
 /**
  * Api interface implementations for managing user space.
@@ -41,7 +42,7 @@ public class UserSpaceManageController {
             @RequestParam(required = false) String key,
             @RequestParam(required = false) String keyword) {
 
-        return new ResultBean<>(spaceService.showSpaceByPagination(page, validCode, fromApp, key, keyword));
+        return new ResultBean<>(spaceService.showSpaceByPagination(page, validCode, fromApp, key, Optional.ofNullable(keyword).map(String::trim).orElse(null)));
     }
 
     @RequestMapping(method = RequestMethod.PUT, path = "//modifySpaceInfo",