diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml index 4d10fad..53f8e84 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/TransferApplyMapper.xml @@ -331,26 +331,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dkta.pro_name AS proName, dkta.single_pro_name AS singleProName, dkta.dept_id AS deptId, - ( SELECT CASE - WHEN - d.ancestors IS NULL - OR d.ancestors = '' THEN - d.dept_name ELSE CONCAT( - (SELECT - GROUP_CONCAT( - dt.dept_name - ORDER BY - INSTR( - CONCAT( ',', d.ancestors, ',' ), - CONCAT( ',', dt.dept_id, ',' )) SEPARATOR ' / ') - FROM - da_ky_sys_dept dt - WHERE - FIND_IN_SET( dt.dept_id, d.ancestors )), - ' / ', - d.dept_name) - END - ) AS deptName, + (SELECT + IF( + d.ancestors IS NULL + OR d.ancestors = '' + OR d.ancestors = '0', + d.dept_name, + CONCAT(( + SELECT + GROUP_CONCAT( dt.dept_name SEPARATOR ' / ' ) + FROM + da_ky_sys_dept dt + WHERE + FIND_IN_SET( dt.dept_id, d.ancestors )), + ' / ', + d.dept_name + ))) AS deptName, dkta.apply_user AS applyUser, dkta.apply_time AS applyTime, dkta.audit_status AS auditStatus, diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TransferApplyServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TransferApplyServiceImpl.java index a10822e..b740947 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TransferApplyServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/TransferApplyServiceImpl.java @@ -116,7 +116,7 @@ public class TransferApplyServiceImpl implements TransferApplyService { @Override public AjaxResult audit(TransferApplyDto dto) { String roleName = AuthUtil.getUser().getRoleName(); - if (roleName.equals("档案管理员")) { +// if (roleName.equals("档案管理员")) { dto.setAuditUser(AuthUtil.getUser().getUserId().toString()); dto.setAuditUserName(AuthUtil.getUser().getUserName()); Integer i = transferApplyMapper.audit(dto); @@ -125,9 +125,9 @@ public class TransferApplyServiceImpl implements TransferApplyService { return AjaxResult.success("审核成功"); } return AjaxResult.error("审核失败"); - } else { - return AjaxResult.error("您没有权限审核"); - } +// } else { +// return AjaxResult.error("您没有权限审核"); +// } } @Override