From 8fd0ad7a95d85cd09c5bf98bc0c05235a162a8af Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 16 十一月 2023 16:40:34 +0800
Subject: [PATCH] bug列表：180(分类上增加关键属性查重校验字段当前分类是否参与校验，历史数据导入代码逻辑中关键属性校验增加过滤条件)
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java
index 3b2866c..b59aab3 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DeptServiceImpl.java
@@ -17,8 +17,10 @@
package com.vci.ubcs.system.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.system.vo.RoleVO;
import org.springblade.core.log.exception.ServiceException;
import com.vci.ubcs.system.cache.SysCache;
import com.vci.ubcs.system.entity.Dept;
@@ -26,11 +28,15 @@
import com.vci.ubcs.system.service.IDeptService;
import com.vci.ubcs.system.vo.DeptVO;
import com.vci.ubcs.system.wrapper.DeptWrapper;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.node.ForestNodeMerger;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringPool;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -47,9 +53,14 @@
private static final String TENANT_ID = "tenantId";
private static final String PARENT_ID = "parentId";
+ /**
+ * nacos閰嶇疆鐨勭鐞嗙粍绉熸埛id
+ */
+ @Value("${user-info.tenant-id}")
+ private String tenantId;
@Override
- public List<DeptVO> lazyList(String tenantId, Long parentId, Map<String, Object> param) {
+ public IPage<DeptVO> lazyList(String tenantId, Long parentId, Map<String, Object> param, Query query) {
// 璁剧疆绉熸埛ID
if (AuthUtil.isAdministrator()) {
tenantId = StringPool.EMPTY;
@@ -74,13 +85,22 @@
if (Func.isEmpty(param.get(PARENT_ID)) && param.size() > 1 && Func.toLong(parentId) == 0L) {
parentId = null;
}
- return baseMapper.lazyList(tenantId, parentId, param);
+ return baseMapper.lazyList(tenantId, parentId, param, Condition.getPage(query));
}
+
+ @Override
+ public List<DeptVO> deptList(String tenantId) {
+ // 杩欓噷鍒ゆ柇鎴戜滑鑷繁閰嶇疆鐨勭鐞嗙粍绉熸埛锛屽彲浠ユ煡璇㈡墍鏈�
+ List<DeptVO> tree = baseMapper.deptList(tenantId.equals(this.tenantId) ? "":tenantId);
+ return tree;
+ }
+
@Override
public List<DeptVO> tree(String tenantId) {
- List<DeptVO> tree = baseMapper.tree(tenantId);
+ // 杩欓噷鍒ゆ柇鎴戜滑鑷繁閰嶇疆鐨勭鐞嗙粍绉熸埛锛屽彲浠ユ煡璇㈡墍鏈�
+ List<DeptVO> tree = baseMapper.tree(tenantId.equals(this.tenantId) ? "":tenantId);
return ForestNodeMerger.merge(tree);
}
--
Gitblit v1.9.3