绩效结果考核申报增加数据权限

ims-service/ims-eval/src/main/java/com/ims/eval/controller/DeptAssessmentDeclarationController.java

@@ -79,11 +79,12 @@ public class DeptAssessmentDeclarationController {
 	public R list(
 		@RequestParam(value = "pageNum") Integer pageNum,
 		@RequestParam(value = "pageSize") Integer pageSize,
+		@RequestParam(value = "deptId") String deptId,
 		@RequestParam(value = "orderNumber", required = false) String orderNumber,
 		@RequestParam(value = "deptName", required = false) String deptName,
 		@RequestParam(value = "annual", required = false) String annual,
 		@RequestParam(value = "declarationMonth", required = false) String declarationMonth) {
-		IPage<DeptAssessmentDeclaration> list = deptAssessmentDeclarationService.listPage(pageNum, pageSize, orderNumber, deptName, annual, declarationMonth);
+		IPage<DeptAssessmentDeclaration> list = deptAssessmentDeclarationService.listPage(pageNum, pageSize, deptId, orderNumber, deptName, annual, declarationMonth);
 		return R.ok().data(list);
 	}
 

ims-service/ims-eval/src/main/java/com/ims/eval/dao/DeptAssessmentDeclarationMapper.java

@@ -13,6 +13,6 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface DeptAssessmentDeclarationMapper extends BaseMapper<DeptAssessmentDeclaration> {
 
-	IPage<DeptAssessmentDeclaration> selectListPage(Page<DeptAssessmentDeclaration> page, @Param("orderNumber") String orderNumber, @Param("deptName") String deptName, @Param("annual") String annual, @Param("declarationMonth") String declarationMonth);
+	IPage<DeptAssessmentDeclaration> selectListPage(Page<DeptAssessmentDeclaration> page, @Param("deptId") String deptId, @Param("orderNumber") String orderNumber, @Param("deptName") String deptName, @Param("annual") String annual, @Param("declarationMonth") String declarationMonth);
 
 }

ims-service/ims-eval/src/main/java/com/ims/eval/service/IDeptAssessmentDeclarationService.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface IDeptAssessmentDeclarationService extends IService<DeptAssessmentDeclaration> {
 
-	IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String orderNumber, String deptName, String annual, String declarationMonth);
+	IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String deptId, String orderNumber, String deptName, String annual, String declarationMonth);
 
 	boolean save(DeptAssessmentDeclaration deptAssessmentDeclaration, HttpServletRequest request);
 

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/DeptAssessmentDeclarationServiceImpl.java

@@ -45,13 +45,16 @@ public class DeptAssessmentDeclarationServiceImpl extends ServiceImpl<DeptAssess
 	private IEvaluationDeptService evaluationDeptService;
 
 	@Override
-	public IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String orderNumber, String deptName, String annual, String declarationMonth) {
+	public IPage<DeptAssessmentDeclaration> listPage(Integer pageNum, Integer pageSize, String deptId, String orderNumber, String deptName, String annual, String declarationMonth) {
+		if ("23031009".equals(deptId)) {//组织人事部
+			deptId = "";
+		}
 		if (null == pageNum || null == pageSize) {
 			throw new RuntimeException("分页参数为空");
 		}
 		//构造分页构造器
 		Page<DeptAssessmentDeclaration> page = new Page<>(pageNum, pageSize);
-		return baseMapper.selectListPage(page, orderNumber, deptName, annual, declarationMonth);
+		return baseMapper.selectListPage(page, deptId, orderNumber, deptName, annual, declarationMonth);
 	}
 
 	@Override

ims-service/ims-eval/src/main/resources/mappers/DeptAssessmentDeclarationMapper.xml

@@ -58,6 +58,9 @@
     <select id="selectListPage" resultType="com.ims.eval.entity.DeptAssessmentDeclaration">
         <include refid="selectDeptAssessmentDeclarationVo"/>
         <where>
+            <if test="deptId != null and deptId != ''">
+                AND dept_id = #{deptId}
+            </if>
             <if test="orderNumber != null and orderNumber != ''">
                 AND order_number like CONCAT('%',#{orderNumber},'%')
             </if>