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 55d9c4108ce6a00a764484beb0c7eb78dbc2ca80..9131f910c31bcd16a7bf26a57b342f75432fc1f4 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 f056a57ca62fa98bd48992ab77c52a73fb5fdc41..bcdac9b00d7c383fc8583dcf8a8b2a0f100fcca2 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 f148537f51f456997674eacb5c0df185e21e41d3..fbb783650acbbabc2885ed136075342e49461b82 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 d2f76f26ae2a1479d085d92d0bf03a2b919fada9..4e01e2b14c9e79bba4bf9d2273840670a0e86c57 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)' });