diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java index 1c5422107..6afdff608 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/custom/SysContractController.java @@ -38,7 +38,7 @@ public class SysContractController extends BaseController { startPage(); List list = sysContractService.selectSysContractList(sysContract); for (SysContract contract : list) { - if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().equals(contract.getSignName())) { + if (contract.getSignName() != null && !contract.getSignName().equals("") && !contract.getName().trim().equals(contract.getSignName())) { contract.setName(contract.getName() + "(" + contract.getSignName() + ")"); } } diff --git a/ruoyi-ui/src/views/custom/contract/index.vue b/ruoyi-ui/src/views/custom/contract/index.vue index 3ea20267b..d9ec18aaa 100644 --- a/ruoyi-ui/src/views/custom/contract/index.vue +++ b/ruoyi-ui/src/views/custom/contract/index.vue @@ -97,7 +97,7 @@ - + - + @@ -116,17 +116,17 @@ {{scope.row.servePromise ? `${scope.row.servePromise}斤`: ''}} - + - + - - + +