修改用户接口参数类型

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

@@ -43,7 +43,21 @@ public class UserController {
 
     @ApiOperation(value = "分页查询用户信息")
     @RequestMapping(value = "/selectPage", method = RequestMethod.POST)
-    public  AjaxMessage<Pagination<UserEntity>> list(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@ApiParam(value = "用户信息", required = false)@RequestBody UserEntity userEntity) {
+    public  AjaxMessage<Pagination<UserEntity>> list(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@ApiParam(value = "用户名称或手机号", required = false)@RequestParam String contion,@ApiParam(value = "部门ID", required = false)@RequestParam Long deptId) {
+        IPage<UserEntity> iPage = new Page<>(pageNum, pageSize);
+        UserEntity  userEntity = new UserEntity();
+        userEntity.setUsername(contion);
+        userEntity.setPhone(contion);
+        userEntity.setCompanyOrgId(deptId);
+        userEntity.setDeptOrgId(deptId);
+        iPage = userService.findPage(iPage, userEntity);
+
+        Pagination<UserEntity> pages = new Pagination<>(iPage);
+        return new AjaxMessage<>(ResultStatus.OK, pages);
+    }
+    @ApiOperation(value = "分页查询用户信息(按参数)")
+    @RequestMapping(value = "/selectPageByParm", method = RequestMethod.POST)
+    public  AjaxMessage<Pagination<UserEntity>> selectPageByParm(@RequestParam Integer pageNum, @RequestParam Integer pageSize,@ApiParam(value = "", required = false)@RequestBody UserEntity userEntity) {
         IPage<UserEntity> iPage = new Page<>(pageNum, pageSize);
         iPage = userService.findPage(iPage, userEntity);
         Pagination<UserEntity> pages = new Pagination<>(iPage);
@@ -115,7 +129,7 @@ public class UserController {
     @ApiOperation(value = "按ID进行批量删除")
     @RequestMapping(value = "/deleteUserByIds", method = RequestMethod.DELETE)
     @ResponseBody
-    public AjaxMessage<Integer> deleteUserByIds(@ApiParam(value = "用户ID", required = true) @RequestParam Long[] ids) {
+    public AjaxMessage<Integer> deleteUserByIds(@ApiParam(value = "用户ID", required = true) @RequestBody Long[] ids) {
         int result = userService.delUserByIds(ids) ? 1 : 0;
         return new AjaxMessage<>(ResultStatus.OK, result);
     }

user_center/src/main/resources/mapper/UserMapper.xml

@@ -86,10 +86,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.status=1
             <if test="user.tenantId != null  and user.tenantId != ''"> and a.tenant_id = #{user.tenantId} </if>
             <if test="user.username != null  and user.username != ''">
-                   and a.username LIKE  concat('%',#{user.username},'%')
+                   and (a.username LIKE  concat('%',#{user.username},'%')
+                      or a.phone like concat('%', #{user.phone},'%'))
 			</if>
-            <if test="user.phone != null  and user.phone != ''">
-                   and a.phone like concat('%', #{user.phone},'%')
+            <if test="user.deptOrgId != null  and user.deptOrgId != ''">
+                 and a.DEPT_ORG_ID = #{user.deptOrgId}
             </if>
 		</where>
 	 </select>