From 0b413f3fd67110cfd7752f27eb171bde06edc4b4 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 18 八月 2023 18:56:39 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysWxCpServiceImpl.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysWxCpServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysWxCpServiceImpl.java
index 9e9fe58..2b94fce 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysWxCpServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/staff/SysWxCpServiceImpl.java
@@ -62,28 +62,31 @@
List<WxCpDepart> wxCpDepartList = wxCpDepartmentService.list(null);
if(wxCpDepartList!=null&&wxCpDepartList.size()>0){
for(WxCpDepart wxCpDepart : wxCpDepartList){
- //获取系统内对应部门
- SysDept sysDept = sysDeptService.getByWxDeptId(wxCpDepart.getId());
- //判断是否有该部门,没有则新建
- if(sysDept!=null){
- //判断是否有变化
- if(!sysDept.getDeptName().equals(wxCpDepart.getName())||sysDept.getOrderNum()!=wxCpDepart.getOrder().intValue()){
- sysDept.setDeptName(wxCpDepart.getName());
+ if(wxCpDepart.getParentId().compareTo(24L)<0){
+ //获取系统内对应部门
+ SysDept sysDept = sysDeptService.getByWxDeptId(wxCpDepart.getId());
+ //判断是否有该部门,没有则新建
+ if(sysDept!=null){
+ //判断是否有变化
+ if(!sysDept.getDeptName().equals(wxCpDepart.getName())||sysDept.getOrderNum()!=wxCpDepart.getOrder().intValue()){
+ sysDept.setDeptName(wxCpDepart.getName());
+ sysDept.setOrderNum(wxCpDepart.getOrder().intValue());
+ sysDept.setUpdateBy("企业微信同步");
+ sysDeptService.updateDept(sysDept);
+ log.info("企业微信同步更新部门:"+wxCpDepart.getName());
+ }
+ }else{
+ sysDept = new SysDept();
+ sysDept.setDelFlag("0");
+ sysDept.setStatus("0");
+ sysDept.setParentId(100L);
sysDept.setOrderNum(wxCpDepart.getOrder().intValue());
- sysDept.setUpdateBy("企业微信同步");
- sysDeptService.updateDept(sysDept);
- log.info("企业微信同步更新部门:"+wxCpDepart.getName());
+ sysDept.setCreateBy("企业微信同步");
+ sysDept.setDeptName(wxCpDepart.getName());
+ sysDept.setWxDeptId(wxCpDepart.getId());
+ sysDeptService.insertDept(sysDept);
+ log.info("企业微信同步新增部门:"+wxCpDepart.getName());
}
- }else{
- sysDept = new SysDept();
- sysDept.setDelFlag("0");
- sysDept.setStatus("0");
- sysDept.setParentId(100L);
- sysDept.setOrderNum(wxCpDepart.getOrder().intValue());
- sysDept.setCreateBy("企业微信同步");
- sysDept.setDeptName(wxCpDepart.getName());
- sysDeptService.insertDept(sysDept);
- log.info("企业微信同步新增部门:"+wxCpDepart.getName());
}
}
}
--
Gitblit v1.7.1