From 42e68faca0756d44b7c880c9876810ee47d6e92b Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期一, 17 二月 2025 17:57:25 +0800 Subject: [PATCH] 1.DNC模块,设备结构树权限分配优化与修改bug 2.MDC模块,设备编辑车间同步平移设备send目录 3.优化原有指派设备代码 --- lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java index 8d13636..bbe3b74 100644 --- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java +++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java @@ -67,6 +67,18 @@ return this.baseMapper.queryProductionIdsByUserId(userId); } + /** + * 鏍规嵁涓�缁勮溅闂磇d鏌ヨ鐢ㄦ埛浜х嚎淇℃伅 + * @param productionIds + */ + @Override + public List<MdcUserProduction> queryByProductionIds(List<String> productionIds){ + if (!productionIds.isEmpty()){ + return super.list(new LambdaQueryWrapper<MdcUserProduction>().in(MdcUserProduction::getProId, productionIds)); + } + return null; + } + @Override @Transactional(rollbackFor = {Exception.class}) public boolean removeByCollection(List<MdcUserProduction> mdcUserProductions) { @@ -119,7 +131,7 @@ @Override public MdcUserProduction getByUserIdAndGroupId(String userId, String proId){ - if(StrUtil.isNotEmpty(userId) || !StrUtil.isNotEmpty(proId)) + if(StrUtil.isEmpty(userId) || StrUtil.isEmpty(proId)) return null; List<MdcUserProduction> list = super.lambdaQuery().eq(MdcUserProduction::getUserId, userId).eq(MdcUserProduction::getProId, proId).list(); if(list == null || list.isEmpty()) -- Gitblit v1.9.3