From ea704e018a27c26ef6deeaea4adc8a28b4d0b27e Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 17 一月 2025 17:15:29 +0800
Subject: [PATCH] 修改指派设备
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DepartmentServiceImpl.java | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DepartmentServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DepartmentServiceImpl.java
index 1f6bdf9..16fc6b2 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DepartmentServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DepartmentServiceImpl.java
@@ -1,25 +1,26 @@
package org.jeecg.modules.dnc.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.activiti.entity.ActivitiDefinition;
import org.jeecg.modules.activiti.service.IActivitiDefinitionService;
-import org.jeecg.modules.dnc.dto.DepartApproveUser;
+import org.jeecg.modules.dnc.ucenter.DepartApproveUser;
import org.jeecg.modules.dnc.dto.DepartmentExt;
-import org.jeecg.modules.dnc.dto.DepartmentUser;
+import org.jeecg.modules.dnc.ucenter.DepartmentUser;
import org.jeecg.modules.dnc.entity.DevicePermissionStream;
import org.jeecg.modules.dnc.entity.PermissionStream;
import org.jeecg.modules.dnc.exception.ExceptionCast;
import org.jeecg.modules.dnc.mapper.DepartmentMapper;
import org.jeecg.modules.dnc.request.DepartmentRequest;
-import org.jeecg.modules.dnc.response.CommonCode;
-import org.jeecg.modules.dnc.response.CommonJsonTree;
-import org.jeecg.modules.dnc.response.DepartmentCode;
-import org.jeecg.modules.dnc.response.QueryPageResponseResult;
+import org.jeecg.modules.dnc.response.*;
import org.jeecg.modules.dnc.service.*;
import org.jeecg.modules.dnc.service.support.DepartmentTreeWrapper;
+import org.jeecg.modules.dnc.service.support.FindsDepartmentChildrenUtil;
import org.jeecg.modules.dnc.ucenter.Department;
import org.jeecg.modules.dnc.utils.ValidateUtil;
import org.jeecg.modules.system.entity.SysUser;
@@ -275,4 +276,65 @@
}
return false;
}
+
+ /**
+ * 鏌ヨ鎵�鏈夐儴闂ㄤ俊鎭�,骞跺垎鑺傜偣杩涜鏄剧ず
+ * @return
+ */
+ @Override
+ public List<DepartmentTreeModel> queryTreeList(){
+ LambdaQueryWrapper<Department> query = new LambdaQueryWrapper<Department>();
+ query.eq(Department::getDeleteFlag, CommonConstant.DEL_FLAG_0.toString());
+ query.orderByAsc(Department::getPriority);
+ List<Department> list = this.list(query);
+ List<DepartmentTreeModel> listResult = FindsDepartmentChildrenUtil.wrapTreeDataToTreeList(list);
+ return listResult;
+ }
+
+
+ /**
+ * 鏌ヨ鎵�鏈夐儴闂ㄤ俊鎭�,骞跺垎鑺傜偣杩涜鏄剧ず
+ * @param ids 澶氫釜閮ㄩ棬id
+ * @return
+ */
+ @Override
+ public List<DepartmentTreeModel> queryTreeList(String ids){
+ List<DepartmentTreeModel> listResult=new ArrayList<>();
+ LambdaQueryWrapper<Department> query = new LambdaQueryWrapper<Department>();
+ query.eq(Department::getDeleteFlag, CommonConstant.DEL_FLAG_0.toString());
+ if(oConvertUtils.isNotEmpty(ids)){
+ query.in(true,Department::getDepartId,ids.split(","));
+ }
+ query.orderByAsc(Department::getPriority);
+ List<Department> list= this.list(query);
+ for (Department department : list) {
+ listResult.add(new DepartmentTreeModel(department));
+ }
+ return listResult;
+ }
+
+ /**
+ * <p>
+ * 鏍规嵁鍏抽敭瀛楁悳绱㈢浉鍏崇殑閮ㄩ棬鏁版嵁
+ * </p>
+ */
+ @Override
+ public List<DepartmentTreeModel> searchByKeyWord(String keyWord,String myDeptSearch,String departIds) {
+ LambdaQueryWrapper<Department> query = new LambdaQueryWrapper<Department>();
+ List<DepartmentTreeModel> newList = new ArrayList<>();
+ query.like(Department::getDepartName, keyWord);
+ //update-begin--Author:huangzhilin Date:20140417 for锛歔bugfree鍙穄缁勭粐鏈烘瀯鎼滅储鍥炴樉浼樺寲--------------------
+ DepartmentTreeModel model = new DepartmentTreeModel();
+ List<Department> departList = this.list(query);
+ if(departList.size() > 0) {
+ for(Department depart : departList) {
+ model = new DepartmentTreeModel(depart);
+ model.setChildren(null);
+ //update-end--Author:huangzhilin Date:20140417 for锛歔bugfree鍙穄缁勭粐鏈烘瀯鎼滅储鍔熷洖鏄句紭鍖�----------------------
+ newList.add(model);
+ }
+ return newList;
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3