From 2bb5d47275effc59de3377ce53e9b9cbf07b781a Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期五, 26 一月 2024 11:05:59 +0800
Subject: [PATCH] 海恒bug修改
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java | 72 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java
index a0ec401..b7a26ed 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java
@@ -17,7 +17,11 @@
import com.ruoyi.system.mapper.sys.SysRoleMapper;
import com.ruoyi.system.service.staff.SysWxCpService;
import com.ruoyi.system.service.sys.ISysDeptService;
-import org.springframework.beans.factory.annotation.Autowired;
+import me.chanjar.weixin.common.error.WxErrorException;
+import me.chanjar.weixin.cp.api.WxCpDepartmentService;
+import me.chanjar.weixin.cp.api.WxCpService;
+import me.chanjar.weixin.cp.bean.WxCpDepart;
+import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -34,17 +38,22 @@
@Service
public class SysDeptServiceImpl implements ISysDeptService
{
- @Autowired
+ @Resource
private SysDeptMapper deptMapper;
- @Autowired
+ @Resource
private SysRoleMapper roleMapper;
- @Autowired
+ @Resource
private SysDeptMenuMapper deptMenuMapper;
@Resource
private SysWxCpService sysWxCpService;
+
+ @Resource
+ @Qualifier("wxService")
+ private WxCpService wxCpService;
+
/**
* 查询部门管理数据
@@ -229,6 +238,8 @@
throw new ServiceException("部门停用，不允许新增");
}
dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+ Long wxDeptId = sysWxCpService.addWxCpDept(1L,dept.getDeptName());
+ dept.setWxDeptId(wxDeptId);
//新增部门
int i = deptMapper.insertDept(dept);
if(dept.getMenuIds()!=null||dept.getStaffMenuIds()!=null){
@@ -289,6 +300,9 @@
dept.setAncestors(newAncestors);
updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
}
+ if(oldDept.getWxDeptId()!=null&&!oldDept.getDeptName().equals(dept.getDeptName())){
+ sysWxCpService.updateWxCpDept(oldDept.getWxDeptId(),dept.getDeptName());
+ }
int result = deptMapper.updateDept(dept);
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
&& !StringUtils.equals("0", dept.getAncestors()))
@@ -343,10 +357,6 @@
@Override
public int deleteDeptById(Long deptId)
{
- SysDept sysDept = this.selectDeptById(deptId);
- if(sysDept.getWxDeptId()!=null){
- sysWxCpService.deleteWxCpDept(sysDept.getWxDeptId());
- }
return deptMapper.deleteDeptById(deptId);
}
@@ -406,5 +416,49 @@
return deptMapper.getByWxDeptId(wxDeptId);
}
-
+ /**
+ * @description 同步部门
+ * @author jqs
+ * @date 2023/8/17 15:42
+ * @param
+ * @return void
+ */
+ @Override
+ public void syncDepartment(){
+ WxCpDepartmentService wxCpDepartmentService = wxCpService.getDepartmentService();
+ try {
+ //从企业微信拉去部门名单
+ List<WxCpDepart> wxCpDepartList = wxCpDepartmentService.list(null);
+ if(wxCpDepartList!=null&&wxCpDepartList.size()>0){
+ for(WxCpDepart wxCpDepart : wxCpDepartList){
+ if(wxCpDepart.getParentId().compareTo(24L)<0){
+ //获取系统内对应部门
+ SysDept sysDept = this.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("企业微信同步");
+ this.updateDept(sysDept);
+ }
+ }else{
+ sysDept = new SysDept();
+ sysDept.setDelFlag("0");
+ sysDept.setStatus("0");
+ sysDept.setParentId(100L);
+ sysDept.setOrderNum(wxCpDepart.getOrder().intValue());
+ sysDept.setCreateBy("企业微信同步");
+ sysDept.setDeptName(wxCpDepart.getName());
+ sysDept.setWxDeptId(wxCpDepart.getId());
+ this.insertDept(sysDept);
+ }
+ }
+ }
+ }
+ } catch (WxErrorException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
--
Gitblit v1.7.1