huminmin
2026-05-15 549bad4e3b36337dc9d3b436efba0103cc0761ff
班组长或者指定班组成员能看到对应数据
已修改4个文件
15 ■■■■ 文件已修改
src/main/java/com/ruoyi/production/mapper/ProductionOperationTaskMapper.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/production/ProductionOperationTaskMapper.xml 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/ruoyi/production/mapper/ProductionOperationTaskMapper.java
@@ -27,7 +27,7 @@
public interface ProductionOperationTaskMapper extends BaseMapper<ProductionOperationTask> {
    IPage<ProductionOperationTaskVo> pageProductionOperationTask(Page<ProductionOperationTaskVo> page,
                                                                 @Param("c") ProductionOperationTaskDto dto);
                                                                 @Param("c") ProductionOperationTaskDto dto, @Param("currentUserId") Long currentUserId);
    List<ProductionTaskStatisticsDto> selectTaskStatisticsByDate(@Param("startDate") LocalDate startDate,
                                                                 @Param("endDate") LocalDate endDate);
src/main/java/com/ruoyi/production/service/impl/ProductionOperationTaskServiceImpl.java
@@ -19,6 +19,7 @@
import com.ruoyi.common.config.FileProperties;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.MatrixToImageWriter;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.production.bean.dto.ProductionOperationTaskDto;
import com.ruoyi.production.bean.vo.ProductionOperationTaskVo;
@@ -60,7 +61,7 @@
    public IPage<ProductionOperationTaskVo> pageProductionOperationTask(Page<ProductionOperationTaskDto> page, ProductionOperationTaskDto dto) {
        // 分页查询生产工序任务
        Page<ProductionOperationTaskVo> voPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
        IPage<ProductionOperationTaskVo> result = baseMapper.pageProductionOperationTask(voPage, dto);
        IPage<ProductionOperationTaskVo> result = baseMapper.pageProductionOperationTask(voPage, dto, SecurityUtils.getLoginUser().getUserId());
        fillUserNames(result.getRecords());
        return result;
    }
src/main/java/com/ruoyi/production/service/impl/ProductionOrderServiceImpl.java
@@ -14,6 +14,7 @@
import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.constant.StorageAttachmentConstants;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.production.bean.dto.ProductionOperationTaskDto;
import com.ruoyi.production.bean.dto.ProductionOrderDto;
import com.ruoyi.production.bean.vo.ProductionBomStructureVo;
@@ -805,7 +806,7 @@
        ProductionOperationTaskDto taskQuery = new ProductionOperationTaskDto();
        taskQuery.setProductionOrderId(productionOrderId);
        IPage<ProductionOperationTaskVo> workOrderPage = productionOperationTaskMapper.pageProductionOperationTask(
                new Page<ProductionOperationTaskVo>(1, -1), taskQuery);
                new Page<ProductionOperationTaskVo>(1, -1), taskQuery, SecurityUtils.getLoginUser().getUserId());
        List<ProductionOperationTaskVo> workOrderList = workOrderPage == null || workOrderPage.getRecords() == null
                ? Collections.emptyList()
        // 遍历处理数据并组装结果
src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
@@ -72,6 +72,13 @@
            <if test="c != null and c.workOrderNo != null and c.workOrderNo != ''">
                and pot.work_order_no like concat('%', #{c.workOrderNo}, '%')
            </if>
            <!-- 班组长可以看到所有关联订单的数据,成员只能看到自己的报工 -->
            <if test="c != null and currentUserId != null">
                and (
                    po.team_leader_user_id = #{currentUserId}
                    or pot.team_user_id = #{currentUserId}
                )
            </if>
        </where>
        order by pot.id desc
    </select>