Commit dc8ff7e6 authored by zhangyingbin's avatar zhangyingbin

增加通过当前登录人所在单位筛选

parent 7fc55c6a
...@@ -36,11 +36,13 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate ...@@ -36,11 +36,13 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
AttachmentServiceImpl attachmentServiceImpl; AttachmentServiceImpl attachmentServiceImpl;
@Autowired @Autowired
AttachmentMapper attachmentMapper; AttachmentMapper attachmentMapper;
@Autowired
OrgServiceImpl orgService;
/** /**
* 分页查询 * 分页查询
*/ */
public Page<MaterialDto> queryForMaterialPage(Page<MaterialDto> page,String name ,String code) { public Page<MaterialDto> queryForMaterialPage(Page<MaterialDto> page,String name ,String code,Long companyId) {
return this.queryForPage(page, null, false,name,code); return this.queryForPage(page, null, false,name,code,companyId);
} }
/** /**
...@@ -89,6 +91,7 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate ...@@ -89,6 +91,7 @@ public class MaterialServiceImpl extends BaseService<MaterialDto, Material, Mate
materialDto.setManufactureAddr(jsonObject.getString("manufactureAddr")); materialDto.setManufactureAddr(jsonObject.getString("manufactureAddr"));
materialDto.setManufactureDate(jsonObject.getDate("manufactureDate")); materialDto.setManufactureDate(jsonObject.getDate("manufactureDate"));
materialDto.setBatchNum(jsonObject.getString("batchNum")); materialDto.setBatchNum(jsonObject.getString("batchNum"));
materialDto.setCompanyId(orgService.getReginParams().getBusinessInfo().getCompanySequenceNbr());
MaterialDto result = this.createWithModel(materialDto); MaterialDto result = this.createWithModel(materialDto);
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment