bonus
/
jstd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

This commit is contained in:
liang.chao 2025-11-29 19:14:10 +08:00
parent 1e324002da
commit 1e309ee110
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml
View File

@ -331,26 +331,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
dkta.pro_name AS proName, dkta.pro_name AS proName,
dkta.single_pro_name AS singleProName, dkta.single_pro_name AS singleProName,
dkta.dept_id AS deptId, dkta.dept_id AS deptId,
( SELECT CASE
WHEN
d.ancestors IS NULL
OR d.ancestors = '' THEN
d.dept_name ELSE CONCAT(
(SELECT (SELECT
GROUP_CONCAT( IF(
dt.dept_name d.ancestors IS NULL
ORDER BY OR d.ancestors = ''
INSTR( OR d.ancestors = '0',
CONCAT( ',', d.ancestors, ',' ), d.dept_name,
CONCAT( ',', dt.dept_id, ',' )) SEPARATOR ' / ') CONCAT((
SELECT
GROUP_CONCAT( dt.dept_name SEPARATOR ' / ' )
FROM FROM
da_ky_sys_dept dt da_ky_sys_dept dt
WHERE WHERE
FIND_IN_SET( dt.dept_id, d.ancestors )), FIND_IN_SET( dt.dept_id, d.ancestors )),
' / ', ' / ',
d.dept_name) d.dept_name
END ))) AS deptName,
) AS deptName,
dkta.apply_user AS applyUser, dkta.apply_user AS applyUser,
dkta.apply_time AS applyTime, dkta.apply_time AS applyTime,
dkta.audit_status AS auditStatus, dkta.audit_status AS auditStatus,

8
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TransferApplyServiceImpl.java
View File

@ -116,7 +116,7 @@ public class TransferApplyServiceImpl implements TransferApplyService {
@Override @Override
public AjaxResult audit(TransferApplyDto dto) { public AjaxResult audit(TransferApplyDto dto) {
String roleName = AuthUtil.getUser().getRoleName(); String roleName = AuthUtil.getUser().getRoleName();
if (roleName.equals("档案管理员")) { // if (roleName.equals("档案管理员")) {
dto.setAuditUser(AuthUtil.getUser().getUserId().toString()); dto.setAuditUser(AuthUtil.getUser().getUserId().toString());
dto.setAuditUserName(AuthUtil.getUser().getUserName()); dto.setAuditUserName(AuthUtil.getUser().getUserName());
Integer i = transferApplyMapper.audit(dto); Integer i = transferApplyMapper.audit(dto);
@ -125,9 +125,9 @@ public class TransferApplyServiceImpl implements TransferApplyService {
return AjaxResult.success("审核成功"); return AjaxResult.success("审核成功");
} }
return AjaxResult.error("审核失败"); return AjaxResult.error("审核失败");
} else { // } else {
return AjaxResult.error("您没有权限审核"); // return AjaxResult.error("您没有权限审核");
} // }
} }
@Override @Override