Commit d77e2946 authored by wujipeng's avatar wujipeng
Browse files

Merge remote-tracking branch 'origin/sxx' into sxx

parents fc64184b 83081b2a
......@@ -19,8 +19,9 @@ public class UserController {
private UserService userService;
@GetMapping(value = "/list")
public List<UserEntity> getUserList(@RequestParam(value = "name", required = false) String name) {
return userService.getUserList(name);
public List<UserEntity> getUserList(@RequestParam(value = "name", required = false) String name, @RequestParam(name = "page", defaultValue = "1") Integer page,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
return userService.getUserList(name, (page - 1) * pageSize, pageSize);
}
@ApiOperation("新增用户")
......
......@@ -20,7 +20,7 @@ public interface UserDao extends BaseMapper<UserEntity> {
*
* @return UserEntity
*/
List<UserEntity> getUserList(@Param("name") String name);
List<UserEntity> getUserList(@Param("name") String name, @Param("page") Integer page, @Param("pageSize") Integer pageSize);
UserEntity getUserByUsernameAndPassword(@Param("name") String name, @Param("password") String password);
......
......@@ -22,4 +22,5 @@ public class ProjectEntity {
private Date endTime;
private String describe;
private String projectName;
private String visiblePeople;
}
......@@ -8,7 +8,7 @@ import java.util.List;
public interface UserService extends IService<UserEntity> {
public List<UserEntity> getUserList(String name);
public List<UserEntity> getUserList(String name, Integer page, Integer pageSize);
/**
* 根据项目leader查询用户
......
......@@ -17,8 +17,8 @@ import java.util.List;
@Service
public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements UserService {
@Override
public List<UserEntity> getUserList(String name) {
return baseMapper.getUserList(name);
public List<UserEntity> getUserList(String name, Integer page, Integer pageSize) {
return baseMapper.getUserList(name, page, pageSize);
}
@Override
......
......@@ -5,7 +5,7 @@
<select id="getProjectList" resultType="com.ruzhoukj.sms.entity.ProjectEntity">
SELECT
id, project_leader, start_time, end_time, `describe`, project_name
id, project_leader, start_time, end_time, `describe`, project_name, visible_people
FROM
project
WHERE
......@@ -14,6 +14,8 @@
AND project_name LIKE CONCAT('%', #{projectName}, '%')
</if>
AND create_user_id = #{userId}
or visible_people like concat('%', #{userId}, '%')
or visible_people = 'all'
AND status = 1
ORDER BY id DESC
LIMIT #{page}, #{pageSize}
......@@ -21,7 +23,7 @@
<select id="getProjectById" resultType="com.ruzhoukj.sms.entity.ProjectEntity">
SELECT
id, project_leader, start_time, end_time, `describe`, project_name
id, project_leader, start_time, end_time, `describe`, project_name, visible_people
FROM
project
WHERE
......
......@@ -4,16 +4,21 @@
<mapper namespace="com.ruzhoukj.sms.dao.UserDao">
<select id="getUserList" resultType="com.ruzhoukj.sms.entity.UserEntity">
select
SELECT
id,
name,
departments,
create_time as createTime,
email
from
FROM
user
where
name like concat('%', #{name}, '%')
WHERE
1 = 1
<if test="name != null and name != ''">
AND name LIKE CONCAT('%', #{name}, '%')
</if>
ORDER BY id DESC
LIMIT #{page}, #{pageSize}
</select>
<select id="getUserByUsernameAndPassword" resultType="com.ruzhoukj.sms.entity.UserEntity">
SELECT
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment