diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAPaymentController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAPaymentController.java index 4cc626d2..34290528 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAPaymentController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAPaymentController.java @@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.system.api.project.dto.ProjectDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -88,7 +89,7 @@ public class BpmOAPaymentController { item.setFactoryName(dtoMap.get(item.getDeptId()).getName()); }); - if (Strings.isNotEmpty(payment.getProjectNo())) { + if (StringUtils.isNotEmpty(payment.getProjectNo())) { // 获取项目信息 ProjectDTO project = projectApi.getProject(payment.getProjectNo()).getCheckedData(); // 设置项目名称 diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAProcureController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAProcureController.java index 93e1efb8..e64061bb 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAProcureController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAProcureController.java @@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.system.api.project.dto.ProjectDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -64,7 +65,7 @@ public class BpmOAProcureController { public CommonResult getOaProcure(@RequestParam("id") Long id) { BpmOAProcureDO oaProcure = bpmOaProcureService.getOaProcure(id); BpmOAProcureRespVO respVO = BpmOAProcureConvert.INSTANCE.convert(oaProcure); - if (respVO != null && Strings.isNotEmpty(respVO.getProjectNo())) { + if (respVO != null && StringUtils.isNotEmpty(respVO.getProjectNo())) { ProjectDTO projectDTO = projectApi.getProject(respVO.getProjectNo()).getCheckedData(); respVO.setProjectName(projectDTO.getName()); } @@ -87,7 +88,7 @@ public class BpmOAProcureController { BpmOAProcureDO oaProcure = bpmOaProcureService.getByProcessInstanceId(processInstanceId); BpmOAProcureRespVO respVO = BpmOAProcureConvert.INSTANCE.convert(oaProcure); - if (respVO != null && Strings.isNotEmpty(respVO.getProjectNo())) { + if (respVO != null && StringUtils.isNotEmpty(respVO.getProjectNo())) { ProjectDTO projectDTO = projectApi.getProject(respVO.getProjectNo()).getCheckedData(); respVO.setProjectName(projectDTO.getName()); } diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/framework/util/StringUtil.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/framework/util/StringUtil.java index 5891b11a..4e870bab 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/framework/util/StringUtil.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/framework/util/StringUtil.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.smartfactory.framework.util; +import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.util.Strings; import java.util.regex.Matcher; @@ -17,7 +18,7 @@ public class StringUtil { */ public static Integer sizeNameAnalysis(String sizeName) { - if (Strings.isEmpty(sizeName)) { + if (StringUtils.isEmpty(sizeName)) { return 1; }