3.3.4 update

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ObeCourseRequirementReportMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.distributed.print.business.bean.result.ObeCourseRequirementListResult;
 import com.qmth.distributed.print.business.entity.ObeCourseRequirementReport;
+import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -24,7 +25,8 @@ public interface ObeCourseRequirementReportMapper extends BaseMapper<ObeCourseRe
      * @param iPage
      * @param professionalId
      * @param cultureProgramName
+     * @param dpr
      * @return
      */
-    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, @Param("professionalId") Long professionalId, @Param("cultureProgramName") String cultureProgramName);
+    public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, @Param("professionalId") Long professionalId, @Param("cultureProgramName") String cultureProgramName, @Param("dpr") DataPermissionRule dpr);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ObeCourseRequirementReportServiceImpl.java

@@ -19,10 +19,14 @@ import com.qmth.distributed.print.business.service.ObeCourseOutlineService;
 import com.qmth.distributed.print.business.service.ObeCourseRequirementMatrixService;
 import com.qmth.distributed.print.business.service.ObeCourseRequirementReportService;
 import com.qmth.distributed.print.business.service.TRBasicInfoService;
+import com.qmth.teachcloud.common.bean.dto.DataPermissionRule;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
+import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.service.BasicCourseService;
+import com.qmth.teachcloud.common.service.BasicRoleDataPermissionService;
 import com.qmth.teachcloud.common.util.JacksonUtil;
+import com.qmth.teachcloud.common.util.ServletUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -61,6 +65,8 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
 
     @Resource
     ObeCourseRequirementMatrixService obeCourseRequirementMatrixService;
+    @Resource
+    private BasicRoleDataPermissionService basicRoleDataPermissionService;
 
     /**
      * 雷达报表计算方法
@@ -317,7 +323,9 @@ public class ObeCourseRequirementReportServiceImpl extends ServiceImpl<ObeCourse
      */
     @Override
     public IPage<ObeCourseRequirementListResult> obeCourseRequirementReportList(IPage<Map> iPage, Long professionalId, String cultureProgramName) {
-        return this.baseMapper.obeCourseRequirementReportList(iPage, professionalId, cultureProgramName);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        DataPermissionRule dpr = basicRoleDataPermissionService.findDataPermission(sysUser.getSchoolId(), sysUser.getId(), ServletUtil.getRequest().getServletPath());
+        return this.baseMapper.obeCourseRequirementReportList(iPage, professionalId, cultureProgramName, dpr);
     }
 
     /**

distributed-print-business/src/main/resources/mapper/ObeCourseRequirementReportMapper.xml

@@ -11,6 +11,7 @@
             from obe_culture_program ocp
         left join obe_course_requirement_report t on ocp.id = t.culture_program_id
         left join basic_professional bp on bp.id = ocp.professional_id
+        left join sys_user su on ocp.create_id = su.id
         <where>
             <if test="professionalId != null and professionalId != ''">
                 and ocp.professional_id = #{professionalId}
@@ -18,6 +19,17 @@
             <if test="cultureProgramName != null and cultureProgramName != ''">
                 and ocp.name like concat('%',#{cultureProgramName},'%')
             </if>
+            <if test="dpr != null">
+                <if test="dpr.requestUserId != null">
+                    AND ocp.create_id = #{dpr.requestUserId}
+                </if>
+                <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
+                    AND su.org_id IN
+                    <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
+                        #{item}
+                    </foreach>
+                </if>
+            </if>
         </where>
     </select>
 </mapper>