From 9a8d9ef43c70fe6d70b494f49b19e5ca6ef01d4b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 14 三月 2025 17:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/MdcProductionServiceImpl.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 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 9b7711e..938efca 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
@@ -7,17 +7,19 @@
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.LoginUser;
import org.jeecg.common.util.FillRuleUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.system.entity.*;
-import org.jeecg.modules.system.mapper.*;
+import org.jeecg.modules.system.mapper.MdcProductionEquipmentMapper;
+import org.jeecg.modules.system.mapper.MdcProductionMapper;
+import org.jeecg.modules.system.mapper.MdcUserProductionMapper;
+import org.jeecg.modules.system.mapper.SysUserMapper;
import org.jeecg.modules.system.model.MdcProductionTreeModel;
import org.jeecg.modules.system.model.ProductionIdModel;
import org.jeecg.modules.system.service.IMdcProductionService;
+import org.jeecg.modules.system.service.ISysParamsService;
import org.jeecg.modules.system.util.FindsProductionsChildrenUtil;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.stereotype.Service;
@@ -45,6 +47,8 @@
@Resource
private MdcProductionEquipmentMapper productionEquipmentMapper;
+ @Resource
+ private ISysParamsService sysParamsService;
/**
* queryTreeList 瀵瑰簲 queryTreeList 鏌ヨ鎵�鏈夌殑浜х嚎鏁版嵁,浠ユ爲缁撴瀯褰㈠紡鍝嶅簲缁欏墠绔�
*/
@@ -62,6 +66,45 @@
}
/**
+ * 鏌ヨ鎵�鏈変骇绾夸俊鎭紝骞跺垎鑺傜偣杩涜鏄剧ず(娣诲姞绯荤粺閰嶇疆)
+ */
+ @Override
+ public List<MdcProductionTreeModel> queryTreeListByConfig(){
+ SysParams sysParams = sysParamsService.getSysPramBySettingKey("dnc_production");
+ LambdaQueryWrapper<MdcProduction> query = new LambdaQueryWrapper<MdcProduction>();
+ if (sysParams == null) {
+ return null;
+ }else {
+ if (("0").equals(sysParams.getSettingValue())){
+ query.eq(MdcProduction::getOrgType,"2");
+ query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+ query.orderByAsc(MdcProduction::getProductionOrder);
+ List<MdcProduction> list = this.list(query);
+ //璁剧疆鐢ㄦ埛id锛岃鍓嶅彴鏄剧ず
+ this.setUserIdsByProList(list);
+ //灏佽涓�绾ф爲
+ List<MdcProductionTreeModel> listResult = new ArrayList<>();
+ for (MdcProduction production : list) {
+ if (production.getDescription().isEmpty()){
+ production.setDescription("");
+ }
+ listResult.add(new MdcProductionTreeModel(production));
+ }
+ //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
+ return listResult;
+ }else {
+ query.eq(MdcProduction::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
+ query.orderByAsc(MdcProduction::getProductionOrder);
+ List<MdcProduction> list = this.list(query);
+ //璁剧疆鐢ㄦ埛id锛岃鍓嶅彴鏄剧ず
+ this.setUserIdsByProList(list);
+ //璋冪敤wrapTreeDataToTreeList鏂规硶鐢熸垚鏍戠姸鏁版嵁
+ return FindsProductionsChildrenUtil.wrapTreeDataToTreeList(list);
+ }
+ }
+ }
+
+ /**
* queryTreeList 鏍规嵁浜х嚎id鏌ヨ,鍓嶇鍥炴樉璋冪敤
*/
@Override
--
Gitblit v1.9.3