diff --git a/web-api/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/web-api/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
index 3c6bd5c..0035fdb 100644
--- a/web-api/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+++ b/web-api/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
@@ -4,6 +4,8 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.stream.Collectors;
+
+import com.ruoyi.common.EncryptionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ruoyi.common.annotation.DataScope;
@@ -21,6 +23,8 @@ import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.mapper.SysRoleMapper;
import com.ruoyi.system.service.ISysDeptService;
+import javax.annotation.Resource;
+
/**
* 部门管理 服务实现
*
@@ -34,6 +38,8 @@ public class SysDeptServiceImpl implements ISysDeptService
@Autowired
private SysRoleMapper roleMapper;
+ @Resource
+ private EncryptionService encryptionService;
/**
* 查询部门管理数据
@@ -123,7 +129,14 @@ public class SysDeptServiceImpl implements ISysDeptService
@Override
public SysDept selectDeptById(Long deptId)
{
- return deptMapper.selectDeptById(deptId);
+ SysDept sysDept = deptMapper.selectDeptById(deptId);
+ if (sysDept.getByteApiKey() != null && !sysDept.getByteApiKey().isEmpty()) {
+ sysDept.setByteApiKey(encryptionService.decode(sysDept.getByteApiKey()));
+ }
+ if (sysDept.getProject() != null && !sysDept.getProject().isEmpty()) {
+ sysDept.setProject(encryptionService.decode(sysDept.getProject()));
+ }
+ return sysDept;
}
/**
@@ -218,6 +231,12 @@ public class SysDeptServiceImpl implements ISysDeptService
throw new ServiceException("部门停用,不允许新增");
}
dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+ if (StringUtils.isNotEmpty(dept.getByteApiKey())) {
+ dept.setByteApiKey(encryptionService.encode(dept.getByteApiKey()));
+ }
+ if (StringUtils.isNotEmpty(dept.getProject())) {
+ dept.setProject(encryptionService.encode(dept.getProject()));
+ }
return deptMapper.insertDept(dept);
}
@@ -239,6 +258,12 @@ public class SysDeptServiceImpl implements ISysDeptService
dept.setAncestors(newAncestors);
updateDeptChildren(dept.getDeptId(), newAncestors, oldAncestors);
}
+ if (StringUtils.isNotEmpty(dept.getByteApiKey())) {
+ dept.setByteApiKey(encryptionService.encode(dept.getByteApiKey()));
+ }
+ if (StringUtils.isNotEmpty(dept.getProject())) {
+ dept.setProject(encryptionService.encode(dept.getProject()));
+ }
int result = deptMapper.updateDept(dept);
if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
&& !StringUtils.equals("0", dept.getAncestors()))
diff --git a/web-api/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/web-api/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 600cb44..bc07b1a 100644
--- a/web-api/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/web-api/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -21,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
- select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.byte_api_key, d.status, d.del_flag, d.create_by, d.create_time
+ select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.byte_api_key, d.status, d.del_flag, d.create_by, d.create_time, d.project
from sys_dept d
@@ -102,9 +103,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
leader,
phone,
email,
- byte_api_key,
+ byte_api_key,
+ project,
status,
- create_by,
+ create_by,
create_time
)values(
#{deptId},
@@ -115,7 +117,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{leader},
#{phone},
#{email},
- #{byteApiKey},
+ #{byteApiKey},
+ #{project},
#{status},
#{createBy},
sysdate()
@@ -132,7 +135,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
leader = #{leader},
phone = #{phone},
email = #{email},
- byte_api_key = #{byteApiKey},
+ byte_api_key = #{byteApiKey},
+ project = #{project},
status = #{status},
update_by = #{updateBy},
update_time = sysdate()