修改订单查询只能查询到自己的订单

src/main/java/com/ydtech/modules/order/dao/InsOrdersMapper.java

@@ -22,10 +22,9 @@ public interface InsOrdersMapper extends BaseMapper<InsOrders> {
 
     InsOrders getByUseridAndLicenseNo(VerifyOrdersVo verifyOrdersVo);
 
-    Long queryPageOrderCount(@Param("orderQueryVo") OrderQueryVo orderQueryVo,
-                             @Param("isTeamLeader") Boolean isTeamLeader,@Param("isCdy")Boolean isCdy);
-    Page<InsOrders> queryPageOrder(@Param("page") Page page,@Param("orderQueryVo") OrderQueryVo orderQueryVo,
-                                   @Param("isTeamLeader") Boolean isTeamLeader,@Param("isCdy")Boolean isCdy);
+    Long queryPageOrderCount(@Param("orderQueryVo") OrderQueryVo orderQueryVo);
+
+    Page<InsOrders> queryPageOrder(@Param("page") Page page,@Param("orderQueryVo") OrderQueryVo orderQueryVo);
 
     List<InsOrdersExcel> queryOrderList(InsOrdersExcelVo insOrdersExcelVo);
 

src/main/java/com/ydtech/modules/order/service/impl/InsOrdersServiceImpl.java

@@ -327,24 +327,24 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
     public BasePageResult<InsOrders> newQueryPageOrder(OrderQueryVo orderQueryVo) {
         Page<InsOrders> page = new Page<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize());
         page.setSearchCount(false).setOptimizeCountSql(false);//关闭count查询
-        // 领导标志
-        boolean isTeamLeader = false;
-        //是否出单员标志
-        boolean isCdy = false;
-        if (StringUtils.isNotEmpty(orderQueryVo.getUserId())) {
-            SysUserRole userRole = sysUserRoleService.selectByUserId(orderQueryVo.getUserId());
-            if (Arrays.asList(SystemConstant.getSysRoleTeamLeader()).contains(userRole.getRoleId().toString())) {
-                //团队长可查询下面所有人员订单
-                isTeamLeader = true;
-            }
-            if (19 == userRole.getRoleId()) {
-                isCdy = true;
-            }
-        }
+//        // 领导标志
+//        boolean isTeamLeader = false;
+//        //是否出单员标志
+//        boolean isCdy = false;
+//        if (StringUtils.isNotEmpty(orderQueryVo.getUserId())) {
+//            SysUserRole userRole = sysUserRoleService.selectByUserId(orderQueryVo.getUserId());
+//            if (Arrays.asList(SystemConstant.getSysRoleTeamLeader()).contains(userRole.getRoleId().toString())) {
+//                //团队长可查询下面所有人员订单
+//                isTeamLeader = true;
+//            }
+//            if (19 == userRole.getRoleId()) {
+//                isCdy = true;
+//            }
+//        }
         orderQueryVo.setEndDate(orderQueryVo.getEndDatePlusOneDay());
 
-        Page<InsOrders> orderVoPage = baseMapper.queryPageOrder(page, orderQueryVo, isTeamLeader, isCdy);
-        Long total = baseMapper.queryPageOrderCount(orderQueryVo, isTeamLeader, isCdy);
+        Page<InsOrders> orderVoPage = baseMapper.queryPageOrder(page, orderQueryVo);
+        Long total = baseMapper.queryPageOrderCount(orderQueryVo);
         orderVoPage.setTotal(total);
         return new BasePageResult<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize(), orderVoPage.getTotal(),
                 orderVoPage.getPages()

src/main/resources/mapper/modules/order/InsOrdersMapper.xml

@@ -293,12 +293,12 @@
                 <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                     and iac.company_id = #{orderQueryVo.companyId}
                 </if>
-                <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">
-                    and io.operatorid = #{orderQueryVo.userId}
-                </if>
-                <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
-                    and io.userid = #{orderQueryVo.userId}
-                </if>
+<!--                <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">-->
+<!--                    and io.operatorid = #{orderQueryVo.userId}-->
+<!--                </if>-->
+<!--                <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">-->
+<!--                    and io.userid = #{orderQueryVo.userId}-->
+<!--                </if>-->
             </where>
             group by io.orderno
         ) as s
@@ -318,9 +318,9 @@
             <if test="orderQueryVo.orderNo != null and orderQueryVo.orderNo != ''">
                 and io.orderno = #{orderQueryVo.orderNo}
             </if>
-            <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != '' and isTeamLeader">
-                and io.deptid like "${orderQueryVo.deptId}%"
-            </if>
+<!--            <if test="orderQueryVo.deptId != null and orderQueryVo.deptId != '' and isTeamLeader">-->
+<!--                and io.deptid like "${orderQueryVo.deptId}%"-->
+<!--            </if>-->
             <if test="orderQueryVo.orderStatus != null and orderQueryVo.orderStatus != ''">
                 and io.orderstatus = #{orderQueryVo.orderStatus}
             </if>
@@ -339,9 +339,9 @@
             <if test="orderQueryVo.companyId != null and orderQueryVo.companyId != ''">
                 and iac.company_id = #{orderQueryVo.companyId}
             </if>
-            <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">
-                and io.operatorid = #{orderQueryVo.userId}
-            </if>
+<!--            <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and isCdy">-->
+<!--                and io.operatorid = #{orderQueryVo.userId}-->
+<!--            </if>-->
             <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
                 and io.userid = #{orderQueryVo.userId}
             </if>