完善用户条件查询

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -76,21 +76,33 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @DataScope(deptAlias = "d", userAlias = "u")
     public TableDataInfo selectUserList(SysUser user)
     {
+        //未删除
         user.setDeleted(0L);
         Page<SysUser> page;
+        //分页
         if (user.getPageNum()!=null&&user.getPageSize()!=null)
         {
             page = new Page<>(user.getPageNum(), user.getPageSize());
         }else{
             page = new Page<>();
         }
+        //查询条件
+        QueryWrapper<SysUser> query = new QueryWrapper<>(user);
+        //下穿
         if (user.getCheckSub()){
             List<Long> ids = orgService.selectCheckSubOrgIdList(user.getOrgId());
+            //清空前端传递的org_id
             user.setOrgId(null);
-            page = userMapper.selectPage( page,new QueryWrapper<>(user).in("org_id",ids));
-        }else {
-            page = userMapper.selectPage(page, new QueryWrapper<>(user));
+            //添加in条件
+            query.in("org_id",ids);
         }
+        //时间范围查询
+        if (user.getParams().get("beginTime")!=null&&user.getParams().get("endTime")!=null){
+            query.between("create_time", user.getParams().get("beginTime"), user.getParams().get("endTime"));
+        }
+        //获取数据
+        page = userMapper.selectPage(page, query);
+        //抓换为TableDataInfo适配前端
         TableDataInfo tableDataInfo = new TableDataInfo();
         tableDataInfo.setMsg("操作成功");
         tableDataInfo.setCode(200);
@@ -322,7 +334,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         userPostMapper.deleteUserPostByUserId(userId);
         // 新增用户与岗位管理
         insertUserPost(user);
-        return userMapper.updateUser(user);
+        return userMapper.updateById(user);
     }
 
     /**

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.xunmei.system.mapper.SysUserMapper">
 
     <resultMap type="com.xunmei.system.api.domain.SysUser" id="SysUserResult">
-        <id     property="userId"       column="user_id"      />
+        <id     property="id"       column="user_id"      />
         <result property="deptId"       column="dept_id"      />
         <result property="userName"     column="user_name"    />
         <result property="nickName"     column="nick_name"    />
@@ -130,11 +130,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where u.user_id = #{userId}
 	</select>
 	
-	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
+	<select id="checkUserNameUnique" parameterType="String" resultType="com.xunmei.system.api.domain.SysUser">
 		select id, username from sys_user where username = #{userName} and deleted = '0' limit 1
 	</select>
 	
-	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
+	<select id="checkPhoneUnique" parameterType="String" resultType="com.xunmei.system.api.domain.SysUser">
 		select id, phone from sys_user where phone = #{phonenumber} and deleted = '0' limit 1
 	</select>