Commit 755ac16f authored by wujipeng's avatar wujipeng
Browse files

优化

parent 99aa73da
......@@ -35,19 +35,19 @@ public class UserController {
@ApiOperation("删除用户")
@DeleteMapping("/{id}")
public Result deleteUser(@PathVariable Integer id) {
public Result deleteUser(@PathVariable String id) {
return Result.success(userService.removeById(id));
}
@ApiOperation("根据用户id查询用户详情")
@GetMapping("/{id}")
public Result getUserById(@PathVariable Integer id) {
public Result getUserById(@PathVariable String id) {
return Result.success(userService.getById(id));
}
@ApiOperation("根据用户id查询用户有权查看的项目")
@GetMapping("/potency/{id}")
public Result listProjectByUserId(@PathVariable Integer id) {
public Result listProjectByUserId(@PathVariable String id) {
return Result.success(userService.listProjectByUserId(id));
}
}
......@@ -38,5 +38,5 @@ public interface UserDao extends BaseMapper<UserEntity> {
* @param id id
* @return List<ProjectEntity>
*/
List<ProjectEntity> listProjectByUserId(@Param("id") Integer id);
List<ProjectEntity> listProjectByUserId(@Param("id") String id);
}
......@@ -16,8 +16,8 @@ import java.math.BigInteger;
@TableName(value = "user")
public class UserEntity {
@TableId(type = IdType.AUTO)
private Integer id;
@TableId(type = IdType.ASSIGN_ID)
private String id;
private String name;
private BigInteger createTime;
private String departments;
......
......@@ -24,5 +24,5 @@ public interface UserService extends IService<UserEntity> {
* @param id id
* @return List<ProjectEntity>
*/
List<ProjectEntity> listProjectByUserId(Integer id);
List<ProjectEntity> listProjectByUserId(String id);
}
......@@ -27,7 +27,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
}
@Override
public List<ProjectEntity> listProjectByUserId(Integer id) {
public List<ProjectEntity> listProjectByUserId(String id) {
return baseMapper.listProjectByUserId(id);
}
}
......@@ -37,17 +37,15 @@
<select id="listProjectByUserId" resultType="com.ruzhoukj.sms.entity.ProjectEntity">
select id,
project_leader as projectLeader,
start_time as startTime,
end_time as endTime,
start_time as startTime,
end_time as endTime,
`describe`,
project_name as projectName,
project_name as projectName,
status,
create_user_id as createUserId
from
project
where
create_user_id = #{id}
or
visible_people like concat('%',#{id},'%')
from project
where create_user_id = #{id}
or visible_people like concat('%', #{id}, '%')
or visible_people = 'all'
</select>
</mapper>
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