zhangherong
2025-03-25 83459b6b0a847ae52218e615ebd9c0b65594888b
art: 设备台账-用户数据权限过滤
已修改2个文件
5 ■■■■■ 文件已修改
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -101,7 +101,7 @@
    @Override
    public IPage<EamEquipment> queryPageList(IPage<EamEquipment> page, EamEquipmentQuery eamEquipment) {
        QueryWrapper<EamEquipment> queryWrapper = new QueryWrapper<>();
        //用户权限
        //用户数据权限
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        if(sysUser == null){
            return page;
@@ -112,7 +112,7 @@
            queryWrapper.in("e.equipment_code", equipArr);
        }else {
            //没有选择设备,根据车间过滤设备
            queryWrapper.exists("select 1 from mdc_user_production t where t.user_id=? and t.pro_id=e.org_id", sysUser.getId());
            queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id", sysUser.getId());
        }
        //查询条件过滤
        if(eamEquipment != null){
lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -1005,6 +1005,7 @@
        mdcEquipment.setDriveType(equipment.getDrivetype());
        mdcEquipment.setControlSystem(equipment.getControlsystem());
        mdcEquipment.setSaveTableName(equipment.getSavetablename());
        mdcEquipment.setEquipmentStatus(CommonConstant.STATUS_NORMAL);
        this.saveMdcEquipment(mdcEquipment, null, productionId);
    }