From 0ad1d513feaf7641614b5679b1b24f613aba982c Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 21 七月 2025 14:28:24 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java index be38f07..49cbae8 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CompanysController.java @@ -88,7 +88,7 @@ companys.setCreateBy(getLoginUserId()); companys.setUpdateBy(getLoginUserId()); - if (StringUtils.isNotBlank(companys.getCode())) { + if (StringUtils.isBlank(companys.getCode())) { String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_COMPANYS_CODE, companys); if (StringUtils.isBlank(ruleCode)) { throw new CoolException("缂栫爜瑙勫垯閿欒锛氳妫�鏌ャ�孲YS_COMPANYS_CODE銆嶆槸鍚﹁缃畬鎴愶紒锛�"); @@ -114,7 +114,6 @@ if (Objects.isNull(companys.getType())) { throw new CoolException("绫诲瀷涓嶈兘涓虹┖锛侊紒"); } - companys.setUpdateTime(null); companys.setUpdateBy(getLoginUserId()); if (!companysService.updateById(companys)) { -- Gitblit v1.9.1