Merge branch 'master_chujiang_0805' into master_quotation

 package com.lframework.xingyun.sc.controller.shipments;
 
 import cn.hutool.core.io.resource.ClassPathResource;
+import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.utils.JsonUtil;
 import com.lframework.starter.web.inner.entity.SysDept;
+import com.lframework.starter.web.inner.entity.SysRole;
 import com.lframework.starter.web.inner.entity.SysUser;
+import com.lframework.starter.web.inner.entity.SysUserDept;
 import com.lframework.starter.web.inner.service.system.SysDeptService;
+import com.lframework.starter.web.inner.service.system.SysRoleService;
+import com.lframework.starter.web.inner.service.system.SysUserDeptService;
 import com.lframework.starter.web.inner.service.system.SysUserService;
 import com.lframework.xingyun.sc.bo.shipments.order.GetShipmentsOrderInfoBo;
 import com.lframework.xingyun.sc.bo.shipments.order.QueryShipmentsOrderInfoBo;
@@ -87,6 +92,10 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     @Resource
     private SysDeptService sysDeptService;
     @Resource
+    private SysRoleService sysRoleService;
+    @Resource
+    private SysUserDeptService sysUserDeptService;
+    @Resource
     private PurchaseOrderInfoService purchaseOrderInfoService;
     @Resource
     private PurchaseOrderLineService purchaseOrderLineService;
@@ -103,7 +112,15 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     @HasPermission({"shipping-plan-manage:invoice:query"})
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryShipmentsOrderInfoBo>> query(@Valid QueryShipmentsOrderInfoVo vo) {
-        PageResult<ShipmentsOrderInfo> pageResult = shipmentsOrderInfoService.query(getPageIndex(vo), getPageSize(vo), vo);
+        // 业务员、办事处内勤、办事处主管按区域/办事处查看数据
+        PageResult<ShipmentsOrderInfo> pageResult;
+        List<String> roleCodes = getCurrentUserRoleCodes();
+        if (isDeptBasedRole(roleCodes)) {
+            applyQueryPermission(vo, roleCodes);
+            pageResult = shipmentsOrderInfoService.queryWithoutPermission(getPageIndex(vo), getPageSize(vo), vo);
+        } else {
+            pageResult = shipmentsOrderInfoService.query(getPageIndex(vo), getPageSize(vo), vo);
+        }
         List<ShipmentsOrderInfo> dataList = pageResult.getDatas();
         List<QueryShipmentsOrderInfoBo> results = null;
         if (!CollectionUtil.isEmpty(dataList)) {
@@ -113,6 +130,126 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
     }
 
     /**
+     * 获取当前用户的角色编码列表
+     */
+    private List<String> getCurrentUserRoleCodes() {
+        String currentUserId = SecurityUtil.getCurrentUser().getId();
+        List<SysRole> roles = sysRoleService.getByUserId(currentUserId);
+        if (CollectionUtil.isEmpty(roles)) {
+            return Collections.emptyList();
+        }
+        return roles.stream().map(SysRole::getCode).collect(Collectors.toList());
+    }
+
+    /**
+     * 判断当前用户是否为业务员、办事处内勤、办事处主管等办事处相关角色
+     */
+    private boolean isDeptBasedRole(List<String> roleCodes) {
+        return roleCodes.contains("ywy")
+                || roleCodes.contains("bscnq")
+                || roleCodes.contains("bsczg");
+    }
+
+    /**
+     * 对业务员、办事处内勤、办事处主管应用区域/办事处权限过滤
+     */
+    private void applyQueryPermission(QueryShipmentsOrderInfoVo vo, List<String> roleCodes) {
+        String currentUserId = SecurityUtil.getCurrentUser().getId();
+        DeptScope scope = resolveDeptScope(currentUserId);
+        if (scope == null) {
+            return;
+        }
+
+        boolean isYwy = roleCodes.contains("ywy");
+
+        if (isYwy) {
+            // 业务员：有区域按区域过滤，没有则按办事处过滤
+            if (StringUtils.isNotBlank(scope.getRegionId())) {
+                vo.setRegion(scope.getRegionId());
+                vo.setDeptId(null);
+            } else if (StringUtils.isNotBlank(scope.getOfficeDeptId())) {
+                vo.setDeptId(scope.getOfficeDeptId());
+                vo.setRegion(null);
+            }
+        } else {
+            // 办事处内勤/办事处主管：始终按办事处过滤
+            if (StringUtils.isNotBlank(scope.getOfficeDeptId())) {
+                vo.setDeptId(scope.getOfficeDeptId());
+                vo.setRegion(null);
+            }
+        }
+    }
+
+    /**
+     * 解析用户的办事处/区域归属
+     */
+    private DeptScope resolveDeptScope(String userId) {
+        List<SysUserDept> userDeptList = sysUserDeptService.getByUserId(userId);
+        if (CollectionUtil.isEmpty(userDeptList)) {
+            return null;
+        }
+
+        Set<String> officeCodes = new HashSet<>(Arrays.asList("BF", "CZ", "DG", "FS", "NB", "SZ", "WZ", "ZT", "WM"));
+        for (SysUserDept userDept : userDeptList) {
+            String deptId = userDept.getDeptId();
+            if (StringUtils.isBlank(deptId)) {
+                continue;
+            }
+
+            SysDept current = sysDeptService.findById(deptId);
+            SysDept child = null;
+            while (current != null) {
+                if (officeCodes.contains(current.getCode())) {
+                    DeptScope scope = new DeptScope();
+                    scope.setOfficeDeptId(current.getId());
+                    if (child != null && !officeCodes.contains(child.getCode())) {
+                        scope.setRegionId(child.getId());
+                    }
+                    return scope;
+                }
+                child = current;
+                if (StringUtils.isBlank(current.getParentId())) {
+                    break;
+                }
+                current = sysDeptService.findById(current.getParentId());
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * 用户办事处/区域归属信息
+     */
+    private static class DeptScope {
+        /**
+         * 办事处ID
+         */
+        private String officeDeptId;
+
+        /**
+         * 区域ID
+         */
+        private String regionId;
+
+        public String getOfficeDeptId() {
+            return officeDeptId;
+        }
+
+        public void setOfficeDeptId(String officeDeptId) {
+            this.officeDeptId = officeDeptId;
+        }
+
+        public String getRegionId() {
+            return regionId;
+        }
+
+        public void setRegionId(String regionId) {
+            this.regionId = regionId;
+        }
+    }
+
+    /**
      * 根据ID查询
      */
     @ApiOperation("根据ID查询")

@@ -76,10 +76,22 @@ public class CarRequestPlanController extends DefaultBaseController {
     @GetMapping("/query")
     public InvokeResult<PageResult<GetCarRequestPlanBo>> query(@Valid QueryCarRequestPlanVo vo) {
 
-        // wlgs角色只能查看要车单运作科审核人已填写的数据
-        applyWlgsRoleFilter(vo);
+        String currentUserId = SecurityUtil.getCurrentUser().getId();
+        List<SysRole> roles = sysRoleService.getByUserId(currentUserId);
+        List<String> roleCodes = CollectionUtil.isEmpty(roles) ? new java.util.ArrayList<>()
+                : roles.stream().map(SysRole::getCode).collect(Collectors.toList());
 
-        PageResult<CarRequestPlan> pageResult = carRequestPlanService.query(getPageIndex(vo), getPageSize(vo), vo);
+        // 办事处内勤/办事处主管能看到所有数据-暂时
+        boolean isBscRole = roleCodes.contains("bscnq") || roleCodes.contains("bsczg");
+
+        PageResult<CarRequestPlan> pageResult;
+        if (isBscRole) {
+            pageResult = carRequestPlanService.queryWithoutPermission(getPageIndex(vo), getPageSize(vo), vo);
+        } else {
+            // wlgs角色只能查看要车单运作科审核人已填写的数据
+            applyWlgsRoleFilter(roleCodes, vo);
+            pageResult = carRequestPlanService.query(getPageIndex(vo), getPageSize(vo), vo);
+        }
 
         List<CarRequestPlan> datas = pageResult.getDatas();
         List<GetCarRequestPlanBo> results = null;
@@ -350,13 +362,7 @@ public class CarRequestPlanController extends DefaultBaseController {
     /**
      * wlgs角色只能查看要车单运作科审核人已填写的数据
      */
-    private void applyWlgsRoleFilter(QueryCarRequestPlanVo vo) {
-        String currentUserId = SecurityUtil.getCurrentUser().getId();
-        List<SysRole> roles = sysRoleService.getByUserId(currentUserId);
-        if (CollectionUtil.isEmpty(roles)) {
-            return;
-        }
-        List<String> roleCodes = roles.stream().map(SysRole::getCode).collect(Collectors.toList());
+    private void applyWlgsRoleFilter(List<String> roleCodes, QueryCarRequestPlanVo vo) {
         if (roleCodes.contains("wlgs")) {
             vo.setOperationsDepartmentAuditorNotNull(true);
         }

@@ -210,6 +210,104 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
     }
 
     @Override
+    public PageResult<ShipmentsOrderInfo> queryWithoutPermission(Integer pageIndex, Integer pageSize, QueryShipmentsOrderInfoVo vo) {
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<ShipmentsOrderInfo> dataList = this.queryWithoutPermission(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(dataList));
+    }
+
+    @Override
+    public List<ShipmentsOrderInfo> queryWithoutPermission(QueryShipmentsOrderInfoVo vo) {
+        if (StringUtils.isNotBlank(vo.getDeptName())) {
+            // 办事处模糊查询处理
+            LambdaQueryWrapper<SysDept> queryWrapper = Wrappers.lambdaQuery(SysDept.class);
+            queryWrapper.like(SysDept::getName, vo.getDeptName());
+            List<SysDept> deptList = sysDeptService.getBaseMapper().selectList(queryWrapper);
+            if (CollectionUtils.isEmpty(deptList)) {
+                return Collections.emptyList();
+            }
+            List<String> deptIds = deptList.stream().map(SysDept::getId).collect(Collectors.toList());
+            vo.setDeptIds(deptIds);
+        }
+        List<ShipmentsOrderInfo> shipmentsOrderList = getBaseMapper().queryWithoutPermission(vo);
+        if (CollectionUtils.isEmpty(shipmentsOrderList)) {
+            return Collections.emptyList();
+        }
+        // 办事处处理
+        List<String> deptIds = new ArrayList<>();
+        for (ShipmentsOrderInfo orderInfo : shipmentsOrderList) {
+            String deptId = orderInfo.getDeptId();
+            String region = orderInfo.getRegion();
+            if (!StringUtils.isBlank(deptId)) {
+                String[] split = deptId.split(",");
+                Collections.addAll(deptIds, split);
+            }
+            if (!StringUtils.isBlank(region)) {
+                String[] split = region.split(",");
+                Collections.addAll(deptIds, split);
+            }
+        }
+        Map<String, SysDept> deptMap = new HashMap<>();
+        if (CollectionUtils.isNotEmpty(deptIds)) {
+            deptIds = deptIds.stream().distinct().collect(Collectors.toList());
+            List<SysDept> deptList = sysDeptService.listByIds(deptIds);
+            deptMap = deptList.stream().collect(Collectors.toMap(SysDept::getId, Function.identity()));
+        }
+        for (ShipmentsOrderInfo orderInfo : shipmentsOrderList) {
+            String deptId = orderInfo.getDeptId();
+            String region = orderInfo.getRegion();
+            if (!StringUtils.isBlank(deptId)) {
+                String[] split = deptId.split(",");
+                if (split.length > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    for (int i = 0; i < split.length; i++) {
+                        SysDept sysDept = deptMap.get(split[i]);
+                        if (sysDept != null) {
+                            builder.append(sysDept.getName());
+                            builder.append(",");
+                        }
+                    }
+                    builder.deleteCharAt(builder.length() - 1);
+
+                    orderInfo.setDeptName(builder.toString());
+                } else {
+                    SysDept sysDept = deptMap.get(split[0]);
+                    if (sysDept != null) {
+                        orderInfo.setDeptName(sysDept.getName());
+                    }
+                }
+            }
+            if (!StringUtils.isBlank(region)) {
+                String[] split = region.split(",");
+                if (split.length > 1) {
+                    StringBuilder builder = new StringBuilder();
+                    for (int i = 0; i < split.length; i++) {
+                        SysDept sysDept = deptMap.get(split[i]);
+                        if (sysDept != null) {
+                            builder.append(sysDept.getName());
+                            builder.append(",");
+                        }
+                    }
+                    builder.deleteCharAt(builder.length() - 1);
+
+                    orderInfo.setRegionName(builder.toString());
+                } else {
+                    SysDept sysDept = deptMap.get(split[0]);
+                    if (sysDept != null) {
+                        orderInfo.setRegionName(sysDept.getName());
+                    }
+                }
+            }
+        }
+
+        return shipmentsOrderList;
+    }
+
+    @Override
     public ShipmentsOrderInfo findById(String id) {
         ShipmentsOrderInfo orderInfo = getBaseMapper().selectById(id);
         // 购货单位

@@ -61,12 +61,30 @@ public class CarRequestPlanServiceImpl extends BaseMpServiceImpl<CarRequestPlanM
     }
 
     @Override
+    public PageResult<CarRequestPlan> queryWithoutPermission(Integer pageIndex, Integer pageSize, QueryCarRequestPlanVo vo) {
+
+        Assert.greaterThanZero(pageIndex);
+        Assert.greaterThanZero(pageSize);
+
+        PageHelperUtil.startPage(pageIndex, pageSize);
+        List<CarRequestPlan> datas = this.queryWithoutPermission(vo);
+
+        return PageResultUtil.convert(new PageInfo<>(datas));
+    }
+
+    @Override
     public List<CarRequestPlan> query(QueryCarRequestPlanVo vo) {
 
         return getBaseMapper().query(vo);
     }
 
     @Override
+    public List<CarRequestPlan> queryWithoutPermission(QueryCarRequestPlanVo vo) {
+
+        return getBaseMapper().queryWithoutPermission(vo);
+    }
+
+    @Override
     public CarRequestPlan findById(String id) {
 
         return getBaseMapper().findById(id);

 package com.lframework.xingyun.sc.mappers;
 
+import com.lframework.starter.web.core.annotations.permission.DataPermission;
+import com.lframework.starter.web.core.annotations.permission.DataPermissions;
 import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
 import com.lframework.xingyun.sc.entity.CarRequestPlan;
 import com.lframework.xingyun.sc.vo.shipments.car.QueryCarRequestPlanVo;
 import org.apache.ibatis.annotations.Param;
@@ -20,9 +23,19 @@ public interface CarRequestPlanMapper extends BaseMapper<CarRequestPlan> {
      * @param vo
      * @return
      */
+    @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
+            @DataPermission(template = "order", alias = "tb")
+    })
     List<CarRequestPlan> query(@Param("vo") QueryCarRequestPlanVo vo);
 
     /**
+     * 查询列表（不带数据权限，用于办事处内勤/办事处主管查看所有数据）
+     * @param vo
+     * @return
+     */
+    List<CarRequestPlan> queryWithoutPermission(@Param("vo") QueryCarRequestPlanVo vo);
+
+    /**
      * 查询
      *
      * @param id 主键

 package com.lframework.xingyun.sc.mappers;
 
+import com.lframework.starter.web.core.annotations.permission.DataPermission;
+import com.lframework.starter.web.core.annotations.permission.DataPermissions;
 import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
 import com.lframework.xingyun.sc.entity.DelayedShipment;
 import com.lframework.xingyun.sc.vo.shipments.delay.QueryDelayedShipmentVo;
 import org.apache.ibatis.annotations.Param;
@@ -20,6 +23,9 @@ public interface DelayedShipmentMapper extends BaseMapper<DelayedShipment> {
      * @param vo
      * @return
      */
+    @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
+            @DataPermission(template = "order", alias = "tb")
+    })
     List<DelayedShipment> query(@Param("vo") QueryDelayedShipmentVo vo);
 
     /**

 package com.lframework.xingyun.sc.mappers;
 
+import com.lframework.starter.web.core.annotations.permission.DataPermission;
+import com.lframework.starter.web.core.annotations.permission.DataPermissions;
 import com.lframework.starter.web.core.mapper.BaseMapper;
+import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
 import com.lframework.xingyun.sc.entity.ReplenishmentOrder;
 import com.lframework.xingyun.sc.vo.purchase.QueryReplenishmentOrderVo;
 import org.apache.ibatis.annotations.Param;
@@ -20,5 +23,8 @@ public interface ReplenishmentOrderMapper extends BaseMapper<ReplenishmentOrder>
      * @param vo
      * @return
      */
+    @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
+            @DataPermission(template = "order", alias = "tb")
+    })
     List<ReplenishmentOrder> query(@Param("vo") QueryReplenishmentOrderVo vo);
 }

@@ -25,9 +25,20 @@ public interface ShipmentsOrderInfoMapper extends BaseMapper<ShipmentsOrderInfo>
      * @param vo    查询条件
      * @return      List<ShipmentsOrderInfo>
      */
+    @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
+            @DataPermission(template = "order", alias = "tb")
+    })
     List<ShipmentsOrderInfo> query(@Param("vo") QueryShipmentsOrderInfoVo vo);
 
     /**
+     * 查询列表（不带数据权限，用于业务员/办事处内勤/办事处主管按区域/办事处查看）
+     *
+     * @param vo    查询条件
+     * @return      List<ShipmentsOrderInfo>
+     */
+    List<ShipmentsOrderInfo> queryWithoutPermission(@Param("vo") QueryShipmentsOrderInfoVo vo);
+
+    /**
      * 批量新增
      *
      * @param orderInfos    数据集合

 package com.lframework.xingyun.sc.mappers;
 
+import com.lframework.starter.web.core.annotations.permission.DataPermission;
+import com.lframework.starter.web.core.annotations.permission.DataPermissions;
+import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
 import com.lframework.xingyun.sc.entity.ShipmentsPlan;
 import com.lframework.starter.web.core.mapper.BaseMapper;
 import com.lframework.xingyun.sc.vo.shipments.plan.QueryShipmentsPlanVo;
@@ -21,6 +24,9 @@ public interface ShipmentsPlanMapper extends BaseMapper<ShipmentsPlan> {
      * @param vo    查询条件
      * @return      List<ShipmentsPlan>
      */
+    @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
+            @DataPermission(template = "order", alias = "tb")
+    })
     List<ShipmentsPlan> query(@Param("vo") QueryShipmentsPlanVo vo);
 
     /**

@@ -32,6 +32,21 @@ public interface ShipmentsOrderInfoService extends BaseMpService<ShipmentsOrderI
     List<ShipmentsOrderInfo> query(QueryShipmentsOrderInfoVo vo);
 
     /**
+     * 查询列表（不带数据权限，用于业务员/办事处内勤/办事处主管按区域/办事处查看）
+     *
+     * @param vo    查询条件
+     * @return      List<ShipmentsOrderInfo>
+     */
+    List<ShipmentsOrderInfo> queryWithoutPermission(QueryShipmentsOrderInfoVo vo);
+
+    /**
+     * 查询列表（不带数据权限，分页）
+     *
+     * @return  PageResult<ShipmentsOrderInfo>
+     */
+    PageResult<ShipmentsOrderInfo> queryWithoutPermission(Integer pageIndex, Integer pageSize, QueryShipmentsOrderInfoVo vo);
+
+    /**
      * 根据ID查询
      *
      * @param id    主键ID

@@ -29,6 +29,18 @@ public interface CarRequestPlanService extends BaseMpService<CarRequestPlan> {
     List<CarRequestPlan> query(QueryCarRequestPlanVo vo);
 
     /**
+     * 查询列表（不带数据权限，用于办事处内勤/办事处主管查看所有数据）
+     */
+    PageResult<CarRequestPlan> queryWithoutPermission(Integer pageIndex, Integer pageSize, QueryCarRequestPlanVo vo);
+
+    /**
+     * 查询列表（不带数据权限）
+     * @param vo
+     * @return
+     */
+    List<CarRequestPlan> queryWithoutPermission(QueryCarRequestPlanVo vo);
+
+    /**
      * 根据ID查询
      * @param id
      * @return

@@ -48,6 +48,12 @@ public class QueryShipmentsOrderInfoVo extends PageVo implements BaseVo, Seriali
     private List<String> deptIds;
 
     /**
+     * 区域ID
+     */
+    @ApiModelProperty("区域ID")
+    private String region;
+
+    /**
      * 办事处名称
      */
     @ApiModelProperty("办事处名称")

@@ -88,6 +88,51 @@
         ORDER BY tb.create_time DESC
     </select>
 
+    <select id="queryWithoutPermission" resultMap="ShipmentsOrderInfo">
+        <include refid="ShipmentsOrderInfo_sql"/>
+        <where>
+            AND tb.status != 'DRAFT'
+            <if test="vo.workshopId != null and vo.workshopId != ''">
+                AND tb.workshop_id = #{vo.workshopId}
+            </if>
+            <if test="vo.shipmentsDateStart != null">
+                AND tb.shipments_date >= #{vo.shipmentsDateStart}
+            </if>
+            <if test="vo.shipmentsDateEnd != null">
+                AND tb.shipments_date &lt;= #{vo.shipmentsDateEnd}
+            </if>
+            <if test="vo.deptIds != null and vo.deptIds.size() > 0">
+                AND (
+                <foreach collection="vo.deptIds" item="deptId" separator=" OR ">
+                    FIND_IN_SET(#{deptId}, tb.dept_id) > 0
+                </foreach>
+                )
+            </if>
+            <if test="vo.deptId != null and vo.deptId != ''">
+                AND FIND_IN_SET(#{vo.deptId}, tb.dept_id) > 0
+            </if>
+            <if test="vo.status != null and vo.status != ''">
+                AND tb.status = #{vo.status}
+            </if>
+            <if test="vo.customerName != null and vo.customerName != ''">
+                AND c.name LIKE CONCAT('%', #{vo.customerName}, '%')
+            </if>
+            <if test="vo.code != null and vo.code != ''">
+                AND tb.code LIKE CONCAT('%', #{vo.code}, '%')
+            </if>
+            <if test="vo.region != null and vo.region != ''">
+                AND FIND_IN_SET(#{vo.region}, tb.region) > 0
+            </if>
+            <if test="vo.searchKey != null and vo.searchKey != ''">
+                AND (
+                tb.code LIKE CONCAT('%', #{vo.searchKey}, '%')
+                OR c.name LIKE CONCAT('%', #{vo.searchKey}, '%')
+                )
+            </if>
+        </where>
+        ORDER BY tb.create_time DESC
+    </select>
+
     <insert id="batchAdd">
         INSERT INTO shipments_order_info (
         id,

@@ -59,6 +59,24 @@
         ORDER BY tb.request_car_date DESC
     </select>
 
+    <select id="queryWithoutPermission" resultMap="CarRequestPlan">
+        <include refid="CarRequestPlan_sql"/>
+        <where>
+            <if test="vo.requestCarDateStart != null">
+                AND tb.request_car_date >= #{vo.requestCarDateStart}
+            </if>
+            <if test="vo.requestCarDateEnd != null">
+                <![CDATA[
+               AND tb.request_car_date <= #{vo.requestCarDateEnd}
+                ]]>
+            </if>
+            <if test="vo.workshopId != null and vo.workshopId != ''">
+                AND tb.workshop_id = #{vo.workshopId}
+            </if>
+        </where>
+        ORDER BY tb.request_car_date DESC
+    </select>
+
     <select id="findById" resultType="com.lframework.xingyun.sc.entity.CarRequestPlan">
         <include refid="CarRequestPlan_sql"/>
         <where>