fix: 生产报工只看查看本人或者交接人

gongchunyi

9 天以前 1b2c073398c674d9b0e4aaf51d5beaae0a1ee069

fix: 生产报工只看查看本人或者交接人

 src/main/java/com/ruoyi/common/constant/Constants.java

@@ -81,6 +81,11 @@
    public static final String SUPER_ADMIN = "admin";



    /**

     * 车间副主任角色权限标识(可查看全部工单数据)

     */

    public static final String WORKSHOP_DEPUTY_DIRECTOR = "dwm";



    /**

     * 角色权限分隔符

     */

    public static final String ROLE_DELIMETER = ",";


 src/main/java/com/ruoyi/production/dto/ProductWorkOrderDto.java

@@ -43,4 +43,7 @@

    @ApiModelProperty(value = "工单类型 正常 /返工返修")
    private String workOrderType;

    @ApiModelProperty(value = "当前登录用户ID(数据权限过滤用)")
    private Long currentUserId;
}

 src/main/java/com/ruoyi/production/service/impl/ProductWorkOrderServiceImpl.java

@@ -9,8 +9,10 @@
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.data.PictureRenderData;
import com.deepoove.poi.data.Pictures;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.MatrixToImageWriter;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.production.dto.ProductWorkOrderDto;
import com.ruoyi.production.mapper.ProductWorkOrderFileMapper;
import com.ruoyi.production.mapper.ProductWorkOrderMapper;
@@ -50,6 +52,10 @@

    @Override
    public IPage<ProductWorkOrderDto> listPage(Page<ProductWorkOrderDto> page, ProductWorkOrderDto productWorkOrder) {
        Long userId = SecurityUtils.getUserId();
        if (!SecurityUtils.isAdmin(userId) && !SecurityUtils.hasRole(Constants.WORKSHOP_DEPUTY_DIRECTOR)) {
            productWorkOrder.setCurrentUserId(userId);
        }
        return productWorkOrdermapper.pageProductWorkOrder(page, productWorkOrder);
    }


 src/main/resources/mapper/production/ProductWorkOrderMapper.xml

@@ -46,6 +46,9 @@
        LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
        LEFT JOIN product p ON p.id = pm.product_id
        where 1=1
        <if test="c.currentUserId != null">
            and (pwo.worker_id = #{c.currentUserId} or pwo.handover_user_id = #{c.currentUserId})
        </if>
        <if test="c.workOrderNo != null and c.workOrderNo != ''">
            and pwo.work_order_no like concat('%',#{c.workOrderNo},'%')
        </if>