Эх сурвалжийг харах

fix(controller): 修复项目管理权限隔离问题

lixuesong 4 жил өмнө
parent
commit
0d45f06aab

+ 2 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmProjectController.java

@@ -82,8 +82,8 @@ public class WmProjectController {
 	@ApiOperation(value = "分页查询项目", notes = "分页查询项目")
 	public R page(Page page, String projectName, String delegate) {
 		try {
-
-			IPage<WmProject> pageResult = wmProjectService.listProjectPage(page, projectName, delegate);
+			Integer deptId = SecurityUtils.getUser().getDeptId();
+			IPage<WmProject> pageResult = wmProjectService.listProjectPage(page, deptId, projectName, delegate);
 			List<WmProject> records = pageResult.getRecords();
 
 			if (CollectionUtil.isNotEmpty(records)) {

+ 2 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/mapper/WmProjectMapper.java

@@ -20,11 +20,12 @@ public interface WmProjectMapper extends BaseMapper<WmProject> {
 	 * 分页查询
 	 *
 	 * @param page
+	 * @param deptId
 	 * @param projectName
 	 * @param delegate
 	 * @return
 	 */
-	IPage<WmProject> listProjectPage(Page page, @Param("projectName") String projectName, @Param("delegate") String delegate);
+	IPage<WmProject> listProjectPage(Page page, @Param("deptId") Integer deptId, @Param("projectName") String projectName, @Param("delegate") String delegate);
 
 	/**
 	 * 根据id查询

+ 2 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/WmProjectService.java

@@ -17,11 +17,12 @@ public interface WmProjectService extends IService<WmProject> {
 	 * 分页查询
 	 *
 	 * @param page
+	 * @param deptId
 	 * @param projectName
 	 * @param delegate
 	 * @return
 	 */
-	IPage<WmProject> listProjectPage(Page page, String projectName, String delegate);
+	IPage<WmProject> listProjectPage(Page page, Integer deptId, String projectName, String delegate);
 
 	/**
 	 * 根据id查询

+ 3 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmProjectServiceImpl.java

@@ -37,13 +37,14 @@ public class WmProjectServiceImpl extends ServiceImpl<WmProjectMapper, WmProject
 	 * 分页查询
 	 *
 	 * @param page
+	 * @param deptId
 	 * @param projectName
 	 * @param delegate
 	 * @return
 	 */
 	@Override
-	public IPage<WmProject> listProjectPage(Page page, String projectName, String delegate) {
-		return wmProjectMapper.listProjectPage(page, projectName, delegate);
+	public IPage<WmProject> listProjectPage(Page page, Integer deptId, String projectName, String delegate) {
+		return wmProjectMapper.listProjectPage(page, deptId, projectName, delegate);
 	}
 
 	/**

+ 1 - 0
hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmProjectMapper.xml

@@ -24,6 +24,7 @@
 		FROM
 			wm_project
 		<where>
+			dept_id = #{deptId}
 			<if test="projectName != null and projectName != ''">
 				AND project_name LIKE CONCAT('%',#{projectName},'%')
 			</if>