Commit 0922c3c8 authored by duoduo-sx's avatar duoduo-sx
Browse files

Fix; 项目优化

parent 91c455db
...@@ -27,11 +27,12 @@ public class ProjectController { ...@@ -27,11 +27,12 @@ public class ProjectController {
*/ */
@GetMapping("/list") @GetMapping("/list")
public ResponseEntity<List<ProjectEntity>> getProjectList(@RequestParam(name="page", defaultValue="1") Integer page, public ResponseEntity<List<ProjectEntity>> getProjectList(@RequestParam(name="page", defaultValue="1") Integer page,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="projectName", defaultValue="") String projectName) { @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="projectName", defaultValue="") String projectName, @RequestHeader("USER_ID") int user_id) {
ProjectQueryRequestEntity data = new ProjectQueryRequestEntity(); ProjectQueryRequestEntity data = new ProjectQueryRequestEntity();
data.setProjectName(projectName); data.setProjectName(projectName);
data.setPageSize(pageSize); data.setPageSize(pageSize);
data.setPage(page); data.setPage((page - 1) * pageSize);
data.setUserId(user_id);
List<ProjectEntity> projectList = projectService.getProjectList(data); List<ProjectEntity> projectList = projectService.getProjectList(data);
return ResponseEntity.ok(projectList); return ResponseEntity.ok(projectList);
} }
......
...@@ -12,4 +12,5 @@ public class ProjectQueryRequestEntity { ...@@ -12,4 +12,5 @@ public class ProjectQueryRequestEntity {
private String projectName; private String projectName;
private int page; private int page;
private int pageSize; private int pageSize;
private int userId;
} }
\ No newline at end of file
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
<if test="projectName != null and projectName != ''"> <if test="projectName != null and projectName != ''">
AND project_name LIKE CONCAT('%', #{projectName}, '%') AND project_name LIKE CONCAT('%', #{projectName}, '%')
</if> </if>
AND create_user_id = #{userId}
AND status = 1
ORDER BY id DESC ORDER BY id DESC
LIMIT #{page}, #{pageSize} LIMIT #{page}, #{pageSize}
</select> </select>
...@@ -44,7 +46,8 @@ ...@@ -44,7 +46,8 @@
</update> </update>
<delete id="deleteProject"> <delete id="deleteProject">
DELETE FROM project UPDATE project
SET status = 0
WHERE id = #{id} WHERE id = #{id}
</delete> </delete>
</mapper> </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