From cf54279f90b0a3f3ff5973f0cc4afaceedc83a0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=B8=85?= Date: Mon, 16 Jun 2025 11:40:54 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E5=A4=96=E9=83=A8=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/system/SysUserController.java | 1 - .../maintain/system/service/impl/SysDeptServiceImpl.java | 9 ++++++--- maintain-ui/src/views/system/dept/index.vue | 2 +- maintain-ui/src/views/system/user/index.vue | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/maintain-admin/src/main/java/com/maintain/web/controller/system/SysUserController.java b/maintain-admin/src/main/java/com/maintain/web/controller/system/SysUserController.java index 55d9c41..9131f91 100644 --- a/maintain-admin/src/main/java/com/maintain/web/controller/system/SysUserController.java +++ b/maintain-admin/src/main/java/com/maintain/web/controller/system/SysUserController.java @@ -1,7 +1,6 @@ package com.maintain.web.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.secure.BCrypt; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.lang.tree.Tree; diff --git a/maintain-system/src/main/java/com/maintain/system/service/impl/SysDeptServiceImpl.java b/maintain-system/src/main/java/com/maintain/system/service/impl/SysDeptServiceImpl.java index f056a57..bcdac9b 100644 --- a/maintain-system/src/main/java/com/maintain/system/service/impl/SysDeptServiceImpl.java +++ b/maintain-system/src/main/java/com/maintain/system/service/impl/SysDeptServiceImpl.java @@ -337,11 +337,14 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { String res = com.zxw.util.tm.HttpTmEncryptUtil.sendPostRequest("http://10.100.102.67:22220/api/basis/deptInfoExtRepair", null, null); Map map = JSONUtil.toBean(res, Map.class); List departmentList = JSONUtil.toList(JSONUtil.toJsonStr(map.get("data")), ExternalDept.class); + List sysDeptList = baseMapper.selectList(); departmentList.forEach(department -> { - SysDept selectOne = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysDept::getExternalDeptCode, department.getDeptCode())); // 查询是否已存在系统 - if (null == selectOne) { - SysDept dept = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysDept::getExternalDeptCode, department.getUpperDeptCode())); + System.out.println("编号："+department.getDeptCode()+",部门" + department.getDeptName()); + if (sysDeptList.stream().noneMatch(item -> null != item.getExternalDeptCode() && item.getExternalDeptCode().equals(department.getDeptCode()))) { + SysDept dept = sysDeptList.stream().filter(item -> item.getExternalDeptCode().equals(department.getUpperDeptCode())) + .findFirst() + .orElseThrow(() -> new RuntimeException("未找到部门=" + department.getUpperDeptCode())); if (dept != null) { SysDept sysDept = new SysDept(); sysDept.setAncestors(dept.getAncestors() + StringUtils.SEPARATOR + dept.getDeptId()); diff --git a/maintain-ui/src/views/system/dept/index.vue b/maintain-ui/src/views/system/dept/index.vue index f148537..fbb7836 100644 --- a/maintain-ui/src/views/system/dept/index.vue +++ b/maintain-ui/src/views/system/dept/index.vue @@ -321,7 +321,7 @@ export default { clickSync() { const loading = this.$loading({ lock: true, - text: '数据同步中，预计需要5-30秒', + text: '数据同步中，预计需要5-10秒', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }); diff --git a/maintain-ui/src/views/system/user/index.vue b/maintain-ui/src/views/system/user/index.vue index d2f76f2..4e01e2b 100644 --- a/maintain-ui/src/views/system/user/index.vue +++ b/maintain-ui/src/views/system/user/index.vue @@ -658,7 +658,7 @@ export default { clickSync() { const loading = this.$loading({ lock: true, - text: '数据同步中，预计需要5-30秒', + text: '数据同步中，预计需要5-10秒', spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }); -- 2.22.0