Merge branch 'dev_1.1.1' into dev_1.1.2

merge

sop-business/src/main/java/com/qmth/sop/business/service/impl/TBDingApplyServiceImpl.java

@@ -183,7 +183,6 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
             }
             supplierId = userSupplierId;
         }
-        dpr = roleType == RoleTypeEnum.REGION_COORDINATOR ? null : dpr;
         IPage<DingApplyUnDoneResult> dingApplyUnDoneResultIPage = this.baseMapper.flowTaskUnDoneList(iPage, serviceId,
                 name, supplierId, customName, startTime, endTime, applyStartTime, applyEndTime, dpr,
                 Objects.nonNull(roleType) ? roleType.name() : null);
@@ -259,7 +258,6 @@ public class TBDingApplyServiceImpl extends ServiceImpl<TBDingApplyMapper, TBDin
             }
             supplierId = userSupplierId;
         }
-        dpr = roleType == RoleTypeEnum.REGION_COORDINATOR ? null : dpr;
         IPage<DingApplyDoneResult> dingApplyDoneResultIPage = this.baseMapper.flowTaskDoneList(iPage, serviceId, name,
                 supplierId, Objects.nonNull(dingExceptionApprove) ? dingExceptionApprove.name() : null, customName,
                 startTime, endTime, applyStartTime, applyEndTime, dpr,

sop-business/src/main/resources/mapper/TBDingApplyMapper.xml

@@ -105,17 +105,17 @@
             <if test="dpr != null and !dpr.hasAdmin and !dpr.hasPmo">
                 <choose>
                     <when test="dpr.hasBusiness">
-                        AND (tbs.service_lead_id = #{dpr.requestUserId} or EXISTS(SELECT 1 FROM t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id and tffl.approve_id = #{dpr.requestUserId}))
+                        AND tbs.service_lead_id = #{dpr.requestUserId}
                     </when>
                     <otherwise>
                         <choose>
                             <when test="dpr.hasRegionManager">
-                                AND (tbc.lead_id = #{dpr.requestUserId} or EXISTS(SELECT 1 FROM t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id and tffl.approve_id = #{dpr.requestUserId}))
+                                AND tbc.lead_id = #{dpr.requestUserId}
                             </when>
                             <otherwise>
                                 <choose>
                                     <when test="dpr.hasRegionCoordinator">
-                                        AND (tbc.region_coordinator_id = #{dpr.requestUserId} or EXISTS(SELECT 1 FROM t_f_flow_log tffl where tffl.flow_id = tfcfe.flow_id and tffl.approve_id = #{dpr.requestUserId}))
+                                        AND tbc.region_coordinator_id = #{dpr.requestUserId}
                                     </when>
                                 </choose>
                             </otherwise>