From 0871a25215fb468f121785600f796a14b54d8ebc Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 06 六月 2025 15:47:00 +0800
Subject: [PATCH] 1.刀具添加字段 2.新增dnc传输日志表 3.导入NC文件默认产生nc文件对应数控程序加工确认表 4.拆分两网 修改yml配置
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcUserProductionServiceImpl.java | 13 ++++++++++++-
1 files changed, 12 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 a293443..f236c24 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
@@ -129,9 +129,20 @@
return super.getBaseMapper().getUserPermsByDeviceId(proId);
}
+ /**
+ * 閫氳繃杞﹂棿id涓庡矖浣峣d绛涢�夌敤鎴�
+ * @param post
+ * @param proId
+ * @return
+ */
+ @Override
+ public List<SysUser> queryByPostAndProId(String post, String proId){
+ return super.getBaseMapper().queryByPostAndProId(post, proId);
+ }
+
@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