yangjun
/
hldy_java_monomer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2026-03-06 13:41:01 +08:00
parent 18e9322a1f
commit 8818497cb1
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/bizSuppliers/controller/NuBizSuppliersMaterialInfoController.java
View File

@ -7,6 +7,8 @@ import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
import org.jeecg.common.api.vo.Result; import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.query.QueryRuleEnum; import org.jeecg.common.system.query.QueryRuleEnum;
@ -199,10 +201,22 @@ public class NuBizSuppliersMaterialInfoController extends JeecgController<NuBizS
List<NuBizSuppliersMaterialInfo> implist = new ArrayList<>(); List<NuBizSuppliersMaterialInfo> implist = new ArrayList<>();
for(int i=0;i<list.size();i++){ for(int i=0;i<list.size();i++){
QueryWrapper<NuBizSuppliersMaterialInfo> queryWrapper = new QueryWrapper<>(); QueryWrapper<NuBizSuppliersMaterialInfo> queryWrapper = new QueryWrapper<>();
if(StringUtils.isBlank(list.get(i).getMaterialName()) || StringUtils.isBlank(list.get(i).getSuppliersId())){
continue;
}
queryWrapper.eq("suppliers_id",list.get(i).getSuppliersId()); queryWrapper.eq("suppliers_id",list.get(i).getSuppliersId());
queryWrapper.eq("material_name",list.get(i).getMaterialName()); queryWrapper.eq("material_name",list.get(i).getMaterialName());
queryWrapper.eq("specification_model",list.get(i).getSpecificationModel()); if(StringUtils.isBlank(list.get(i).getSpecificationModel())){
queryWrapper.eq("brand_type",list.get(i).getBrandType()); queryWrapper.isNull("specification_model");
}else{
queryWrapper.eq("specification_model",list.get(i).getSpecificationModel());
}
if(StringUtils.isBlank(list.get(i).getBrandType())){
queryWrapper.isNull("brand_type");
}else{
queryWrapper.eq("brand_type",list.get(i).getBrandType());
}
queryWrapper.last("limit 1");
NuBizSuppliersMaterialInfo a = nuBizSuppliersMaterialInfoService.getOne(queryWrapper); NuBizSuppliersMaterialInfo a = nuBizSuppliersMaterialInfoService.getOne(queryWrapper);
if(a==null){ if(a==null){
implist.add(list.get(i)); implist.add(list.get(i));