From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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