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

代码提交

This commit is contained in:
liang.chao 2025-09-28 13:28:15 +08:00
parent a5a948034a
commit 58033ce671
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
bonus-admin/src/main/java/com/bonus/web/service/impl/TransferApplyServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.bonus.web.service.impl;
import com.bonus.common.core.domain.AjaxResult; import com.bonus.common.core.domain.AjaxResult;
import com.bonus.common.core.domain.entity.SysDept; import com.bonus.common.core.domain.entity.SysDept;
import com.bonus.common.core.domain.entity.SysRole;
import com.bonus.web.controller.tool.TreeBuilder; import com.bonus.web.controller.tool.TreeBuilder;
import com.bonus.web.domain.*; import com.bonus.web.domain.*;
import com.bonus.web.mapper.TransferApplyMapper; import com.bonus.web.mapper.TransferApplyMapper;
@ -94,14 +95,21 @@ public class TransferApplyServiceImpl implements TransferApplyService {
@Override @Override
public AjaxResult audit(TransferApplyDto dto) { public AjaxResult audit(TransferApplyDto dto) {
dto.setAuditUser(getLoginUser().getUserId().toString()); List<SysRole> roles = getLoginUser().getUser().getRoles();
dto.setAuditUserName(getLoginUser().getUsername()); boolean isArchivist = roles.stream()
Integer i = transferApplyMapper.audit(dto); .anyMatch(role -> "档案管理员".equals(role.getRoleName()));
if (i > 0) { if (isArchivist) {
transferApplyMapper.addTransferAuditRecord(dto); dto.setAuditUser(getLoginUser().getUserId().toString());
return AjaxResult.success("审核成功"); dto.setAuditUserName(getLoginUser().getUsername());
Integer i = transferApplyMapper.audit(dto);
if (i > 0) {
transferApplyMapper.addTransferAuditRecord(dto);
return AjaxResult.success("审核成功");
}
return AjaxResult.error("审核失败");
} else {
return AjaxResult.error("您没有权限审核");
} }
return AjaxResult.error("审核失败");
} }
@Override @Override

17
bonus-system/src/main/java/com/bonus/system/service/impl/SystemConfigServiceImpl.java
View File

@ -32,11 +32,15 @@ public class SystemConfigServiceImpl implements ISystemConfigService {
@Override @Override
public AjaxResult add(SystemConfig config) { public AjaxResult add(SystemConfig config) {
Integer add = systemConfigMapper.add(config); try {
if (add > 0) { Integer add = systemConfigMapper.add(config);
return AjaxResult.success("添加成功"); if (add > 0) {
} else { return AjaxResult.success("添加成功");
return AjaxResult.error("添加失败"); } else {
return AjaxResult.error("添加失败");
}
} catch (Exception e) {
return AjaxResult.error("配置编码不可重复");
} }
} }
@ -52,6 +56,9 @@ public class SystemConfigServiceImpl implements ISystemConfigService {
@Override @Override
public AjaxResult del(SystemConfig config) { public AjaxResult del(SystemConfig config) {
if (config.getId() <= 4) {
return AjaxResult.error("该配置不可删除");
}
Integer del = systemConfigMapper.del(config); Integer del = systemConfigMapper.del(config);
if (del > 0) { if (del > 0) {
return AjaxResult.success("删除成功"); return AjaxResult.success("删除成功");