修改参数判断

user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -53,8 +53,10 @@ public class UserController {
     public  AjaxMessage<Pagination<UserEntity>> list(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@RequestParam(value = "contion",required = false) String contion,@RequestParam(value = "deptId",required = false) Long deptId) {
         IPage<UserEntity> iPage = new Page<>(pageNum, pageSize);
         UserEntity  userEntity = new UserEntity();
-        userEntity.setUsername(contion.trim());
-        userEntity.setPhone(contion.trim());
+        if(contion!=null&&contion!="") {
+            userEntity.setUsername(contion.trim());
+            userEntity.setPhone(contion.trim());
+        }
         userEntity.setCompanyOrgId(deptId);
         userEntity.setDeptOrgId(deptId);
         iPage = userService.findPage(iPage, userEntity);