ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ak:708775f6dc3711eb3362dc7d8e5d1404726520cd
Branches Tags
ak:dev
ak:prod
ak:frx
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标
..
compare: ak:5457d15793e54feb5cab12bfe77efff4a7b63bc5
Branches Tags
ak:dev
ak:prod
ak:frx
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标

No commits in common. "708775f6dc3711eb3362dc7d8e5d1404726520cd" and "5457d15793e54feb5cab12bfe77efff4a7b63bc5" have entirely different histories.
708775f6dc ... 5457d15793

4 changed files with 5 additions and 9 deletions
Show Stats Expand all files Collapse all files

3
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAPaymentController.java
View File

@ -17,7 +17,6 @@ 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.*;
@ -89,7 +88,7 @@ public class BpmOAPaymentController {
item.setFactoryName(dtoMap.get(item.getDeptId()).getName());
});
if (StringUtils.isNotEmpty(payment.getProjectNo())) {
if (Strings.isNotEmpty(payment.getProjectNo())) {
// 获取项目信息
ProjectDTO project = projectApi.getProject(payment.getProjectNo()).getCheckedData();
// 设置项目名称

5
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAProcureController.java
View File

@ -12,7 +12,6 @@ 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.*;
@ -65,7 +64,7 @@ public class BpmOAProcureController {
public CommonResult<BpmOAProcureRespVO> getOaProcure(@RequestParam("id") Long id) {
BpmOAProcureDO oaProcure = bpmOaProcureService.getOaProcure(id);
BpmOAProcureRespVO respVO = BpmOAProcureConvert.INSTANCE.convert(oaProcure);
if (respVO != null && StringUtils.isNotEmpty(respVO.getProjectNo())) {
if (respVO != null && Strings.isNotEmpty(respVO.getProjectNo())) {
ProjectDTO projectDTO = projectApi.getProject(respVO.getProjectNo()).getCheckedData();
respVO.setProjectName(projectDTO.getName());
}
@ -88,7 +87,7 @@ public class BpmOAProcureController {
BpmOAProcureDO oaProcure = bpmOaProcureService.getByProcessInstanceId(processInstanceId);
BpmOAProcureRespVO respVO = BpmOAProcureConvert.INSTANCE.convert(oaProcure);
if (respVO != null && StringUtils.isNotEmpty(respVO.getProjectNo())) {
if (respVO != null && Strings.isNotEmpty(respVO.getProjectNo())) {
ProjectDTO projectDTO = projectApi.getProject(respVO.getProjectNo()).getCheckedData();
respVO.setProjectName(projectDTO.getName());
}

3
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java
View File

@ -10,7 +10,6 @@ import cn.iocoder.yudao.module.bpm.dal.dataobject.task.BpmTaskExtDO;
import cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceResultEnum;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.mapstruct.ap.internal.util.Strings;
@ -97,7 +96,7 @@ public interface BpmTaskExtMapper extends BaseMapperX<BpmTaskExtDO> {
queryWrapperX.innerJoin(BpmProcessInstanceExtDO.class, on -> on
.eq(BpmTaskExtDO::getProcessInstanceId, BpmProcessInstanceExtDO::getProcessInstanceId)
.in(Objects.nonNull(userIds), BpmProcessInstanceExtDO::getStartUserId, userIds)
.eq(StringUtils.isNotEmpty(pageVO.getName()), BpmProcessInstanceExtDO::getName, pageVO.getName()));
.eq(Strings.isNotEmpty(pageVO.getName()), BpmProcessInstanceExtDO::getName, pageVO.getName()));
queryWrapperX.likeRight(BpmProcessInstanceExtDO::getProcessDefinitionId, "oa_");
queryWrapperX.eq(BpmTaskExtDO::getAssigneeUserId, userId);
queryWrapperX.betweenIfPresent(BpmTaskExtDO::getCreateTime, pageVO.getCreateTime());

3
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/framework/util/StringUtil.java
View File

@ -1,6 +1,5 @@
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;
@ -18,7 +17,7 @@ public class StringUtil {
*/
public static Integer sizeNameAnalysis(String sizeName) {
if (StringUtils.isEmpty(sizeName)) {
if (Strings.isEmpty(sizeName)) {
return 1;
}