1.屏蔽出单员出单的单子直接给到上级人员团队长

2.添加渠道团队长可以查看下级出单员的单子

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

@@ -23,9 +23,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);
+                             @Param("isTeamLeader") Boolean isTeamLeader,@Param("isCdy")Boolean isCdy,@Param("deptId")String deptId);
     Page<InsOrders> queryPageOrder(@Param("page") Page page,@Param("orderQueryVo") OrderQueryVo orderQueryVo,
-                                   @Param("isTeamLeader") Boolean isTeamLeader,@Param("isCdy")Boolean isCdy);
+                                   @Param("isTeamLeader") Boolean isTeamLeader,@Param("isCdy")Boolean isCdy,@Param("deptId")String deptId);
 
     List<InsOrdersExcel> queryOrderList(InsOrdersExcelVo insOrdersExcelVo);
 

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

@@ -281,9 +281,10 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
         }
         if (isCdy) {
+            //add by  hxl 注释 业务员录单变为团队长的逻辑
             //如果是出单员  获取最终实际业务员
-            SysUser user = sysUserService.getById(realUserId);
-            realUserId = user.getOperatorCode();
+            // SysUser user = sysUserService.getById(realUserId);
+            // realUserId = user.getOperatorCode();
         } else {
             //如果传递的业务归属人且与登录人不一致，则是代客录单业务
             if (StringUtils.isNotEmpty(quoteInfoVo.getUserId()) && !userId.equals(quoteInfoVo.getUserId())) {
@@ -391,8 +392,19 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
          }
          orderQueryVo.setEndDate(orderQueryVo.getEndDatePlusOneDay());
          **/
-        Page<InsOrders> orderVoPage = baseMapper.queryPageOrder(page, orderQueryVo, adminFalg, null);
-        Long total = baseMapper.queryPageOrderCount(orderQueryVo, adminFalg, null);
+        //添加渠道团队长可以查看下级  add by hxl   2024-07-12
+        SysUserRole userRole = sysUserRoleService.selectByUserId(orderQueryVo.getUserId());
+        SysUser user = sysUserService.getById(orderQueryVo.getUserId());
+        SysDept dept = sysDeptService.getById(user.getDeptId());
+        String deptId="";
+        boolean isCdy =false;
+        //机构类型为1  角色id=21是渠道团队长
+        if(dept!=null && "1".equals(dept.getManagementSource()) && userRole!=null && userRole.getRoleId()==21){
+            deptId=dept.getId();
+            isCdy = true;
+        }
+        Page<InsOrders> orderVoPage = baseMapper.queryPageOrder(page, orderQueryVo, adminFalg, isCdy,deptId);
+        Long total = baseMapper.queryPageOrderCount(orderQueryVo, adminFalg, isCdy,deptId);
         orderVoPage.setTotal(total);
         return new BasePageResult<>(orderQueryVo.getPageNum(), orderQueryVo.getPageSize(), orderVoPage.getTotal(),
                 orderVoPage.getPages()

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

@@ -320,9 +320,18 @@
                     and io.operatorid = #{orderQueryVo.userId}
               </if>
                -->
-              <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
-                   and io.userid = #{orderQueryVo.userId}
-              </if>
+                <choose>
+                    <when test="isCdy">
+                        <if test="deptId != null and deptId != '' ">
+                            and io.deptid like "${deptId}%"
+                        </if>
+                    </when>
+                    <otherwise>
+                        <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
+                            and io.userid = #{orderQueryVo.userId}
+                        </if>
+                    </otherwise>
+                </choose>
             </where>
             group by io.orderno
         ) as s
@@ -375,9 +384,18 @@
                 and io.operatorid = #{orderQueryVo.userId}
             </if>
              -->
-            <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
-                and io.userid = #{orderQueryVo.userId}
-            </if>
+            <choose>
+                <when test="isCdy">
+                    <if test="deptId != null and deptId != '' ">
+                        and io.deptid like "${deptId}%"
+                    </if>
+                </when>
+                <otherwise>
+                    <if test="orderQueryVo.userId != null and orderQueryVo.userId != '' and !isTeamLeader">
+                        and io.userid = #{orderQueryVo.userId}
+                    </if>
+                </otherwise>
+            </choose>
         </where>
         group by orderno
         order by io.createtime desc