From 1ca4c6c6c7861c07980ad0dcd8d5df4b0219bfdc Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 06 九月 2023 19:01:48 +0800
Subject: [PATCH] bug
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/sys/SysDeptServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 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..cbeedb4 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
@@ -20,7 +20,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -43,7 +42,7 @@
@Autowired
private SysDeptMenuMapper deptMenuMapper;
- @Resource
+ @Autowired
private SysWxCpService sysWxCpService;
/**
@@ -229,6 +228,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 +290,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 +347,6 @@
@Override
public int deleteDeptById(Long deptId)
{
- SysDept sysDept = this.selectDeptById(deptId);
- if(sysDept.getWxDeptId()!=null){
- sysWxCpService.deleteWxCpDept(sysDept.getWxDeptId());
- }
return deptMapper.deleteDeptById(deptId);
}
--
Gitblit v1.7.1