1、修改pc端台账显示数据筛选

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/controller/RiskPlanController.java

@@ -33,6 +33,8 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 
+import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
+
 /**
  * 风险计划Controller
  *
@@ -56,6 +58,11 @@ public class RiskPlanController extends BaseController
     public TableDataInfo list(RiskPlan riskPlan)
     {
         startPage();
+        if ("ledger".equals(riskPlan.getIsLedger())){
+            riskPlan.setCreateDeptId(getDeptId());
+        }else {
+            riskPlan.setCreateUserId(getLoginUser().getUserId());
+        }
         List<RiskPlanAppTaskDetailsDto> list = riskPlanService.selectRiskPlanList(riskPlan);
         list.forEach(dto -> {
             dto.setStatusName(RiskPlanStatusType.getTitleByStatus(dto.getStatus()).getTitle());

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -64,7 +64,6 @@ public class RiskPlanServiceImpl extends MPJBaseServiceImpl<RiskPlanMapper, Risk
      */
     @Override
     public List<RiskPlanAppTaskDetailsDto> selectRiskPlanList(RiskPlan riskPlan) {
-        riskPlan.setCreateUserId(getLoginUser().getUserId());
         return riskPlanMapper.selectRiskPlanList(riskPlan);
     }
 

censoft-rongtong/src/main/resources/mapper/system/RiskPlanMapper.xml

@@ -71,7 +71,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and TT.project_id = #{projectId}</if>
             <if test="buildingIds != null  and buildingIds != ''"> and TT.building_ids = #{buildingIds}</if>
             <if test="createUserId != null "> and TT.create_user_id = #{createUserId}</if>
-            <if test="createDeptId != null "> and TT.create_dept_id = #{createDeptId}</if>
+            <if test="createDeptId != null "> AND ( sd2.dept_id = #{createDeptId} OR FIND_IN_SET( #{createDeptId}, sd2.ancestors ) )</if>
             <if test="leaderUserId != null "> and TT.leader_user_id = #{leaderUserId}</if>
             <if test="workUserIds != null  and workUserIds != ''"> and TT.work_user_ids = #{workUserIds}</if>
             <if test="approveUserId != null "> and TT.approve_user_id = #{approveUserId}</if>