lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lcj:f00b98714a9cb573d29d6d7256555e1b836e8534
Branches Tags
lcj:dev lcj:prod
..
compare: lcj:123896f08b1002804dd10a5d74f6c5681e715eb4
Branches Tags
lcj:dev lcj:prod

2 Commits
f00b98714a ... 123896f08b

Author SHA1 Message Date
屈展航
123896f08b Merge remote-tracking branch 'origin/dev' into dev 2025-10-25 21:25:40 +08:00
屈展航
a8a198b51f 10-25-增加校验 2025-10-25 21:25:33 +08:00
1 changed files with 9 additions and 11 deletions
Expand all files Collapse all files

20
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/service/impl/XzdCustomerinformationServiceImpl.java
View File

@ -2,7 +2,11 @@ package org.dromara.xzd.service.impl;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.vo.XzdCustomerSupplierVos;
import org.dromara.common.core.service.XzdCustomerSupplierService;
import org.dromara.common.core.service.XzdCustomerinformationService;
@ -10,25 +14,19 @@ import org.dromara.common.core.service.XzdSupplierInfoService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.SpringUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.system.domain.vo.SysDeptVo;
import org.dromara.xzd.domain.vo.XzdSupplierInfoVo;
import org.springframework.stereotype.Service;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.xzd.domain.XzdCustomerinformation;
import org.dromara.xzd.domain.bo.XzdCustomerinformationBo;
import org.dromara.xzd.domain.vo.XzdCustomerinformationVo;
import org.dromara.xzd.domain.XzdCustomerinformation;
import org.dromara.xzd.mapper.XzdCustomerinformationMapper;
import org.dromara.xzd.service.IXzdCustomerinformationService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Collection;
/**
* 客户信息Service业务层处理
@ -194,7 +192,7 @@ public class XzdCustomerinformationServiceImpl extends ServiceImpl<XzdCustomerin
if (ObjectUtil.isEmpty(xzdCustomerSuppliervo) ){
return null;
}
if (xzdCustomerSuppliervo.getType().equals("1")){
if (xzdCustomerSuppliervo.getType()!= null && xzdCustomerSuppliervo.getType().equals("1")){
XzdCustomerinformationVo vo = SpringUtils.getAopProxy(this).getBaseMapper().selectVoById(id);
if (ObjectUtil.isNotNull(vo)) {
list.add(vo.getUnitName());