From bc263d8bed5d1405f275bb8638a9bec9eaf06585 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 31 三月 2025 09:42:00 +0800
Subject: [PATCH] 添加审签逻辑，移动flow通用代码，添加根据角色查询用户，新增时间工具类，修改指派设备bug
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
index 5bfc7ff..bc363c2 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java
@@ -9,9 +9,11 @@
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.FillRuleConstant;
import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.*;
@@ -79,12 +81,25 @@
@Override
public List<MdcProductionTreeModel> queryTreeListByConfig(){
SysParams sysParams = sysParamsService.getSysPramBySettingKey("dnc_production");
+ LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
if (sysParams == null) {
return null;
}else {
+ List<String> productionIds = new ArrayList<>();
+ if (!("admin").equals(loginUser.getUsername())) {
+ //涓嶆槸瓒呯骇绠＄悊鍛橈紝鑾峰彇鐢ㄦ埛鎷ユ湁鐨勪骇绾�
+ if (loginUser.getProductionIds() != null) {
+ if (loginUser.getProductionIds().contains(",")) {
+ productionIds = Arrays.asList(loginUser.getProductionIds().split(","));
+ } else {
+ productionIds = Collections.singletonList(loginUser.getProductionIds());
+ }
+ }
+ }
if (("0").equals(sysParams.getSettingValue())){
query.eq(MdcProduction::getOrgType,"2");
+ query.in(!productionIds.isEmpty(), MdcProduction::getId, productionIds);
query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
query.orderByAsc(MdcProduction::getProductionOrder);
List<MdcProduction> list = this.list(query);
--
Gitblit v1.9.3