diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java index 86bc6c26..4cc51e90 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysCustomerMapper.java @@ -86,7 +86,7 @@ public interface SysCustomerMapper int restoreSysCustomerById(Long id); - SysCustomerVo cancelSysCustomerById(Long id); + int cancelSysCustomerById(Long id); SysCustomerVo selectSysCustomerByCustomer(SysCustomerVo sysCustomerVo); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java index b15d6d3b..82c7e714 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysCustomerServiceImpl.java @@ -319,7 +319,7 @@ public class SysCustomerServiceImpl implements ISysCustomerService @Override @Transactional(rollbackFor = Exception.class) public ProcessInstance cancelSysCustomerById(Long id) { - SysCustomerVo sysCustomerVo = sysCustomerMapper.cancelSysCustomerById(id); + SysCustomerVo sysCustomerVo = sysCustomerMapper.selectSysCustomerById(id); // 审核状态-待审核 sysCustomerVo.setAuditStatus("0"); SysUser user = ShiroUtils.getSysUser(); diff --git a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html index 94487295..541ed47a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/customer/customer.html +++ b/ruoyi-admin/src/main/resources/templates/system/customer/customer.html @@ -414,6 +414,8 @@ removeUrl: prefix + "/remove", exportUrl: prefix + "/export", detailUrl: prefix + "/detail/{id}", + cancelUrl: prefix + "/cancel/{id}", + restoreUrl: prefix + "/restore/{id}", modalName: "客户基本信息", fixedColumns:true, fixedRightNumber:1,