|
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
import com.kcim.common.constants.NumberConstant;
|
|
import com.kcim.common.constants.NumberConstant;
|
|
import com.kcim.common.util.UserContext;
|
|
import com.kcim.common.util.UserContext;
|
|
import com.kcim.dao.mapper.ItemMapper;
|
|
import com.kcim.dao.mapper.ItemMapper;
|
|
-import com.kcim.dao.model.EmpCostMap;
|
|
|
|
import com.kcim.dao.model.Item;
|
|
import com.kcim.dao.model.Item;
|
|
import com.kcim.vo.SessionUserVO;
|
|
import com.kcim.vo.SessionUserVO;
|
|
import org.springframework.stereotype.Repository;
|
|
import org.springframework.stereotype.Repository;
|
|
@@ -31,7 +30,7 @@ public class ItemRepository extends ServiceImpl<ItemMapper, Item> {
|
|
queryWrapper.eq(Item::getHospId, UserContext.getHospId());
|
|
queryWrapper.eq(Item::getHospId, UserContext.getHospId());
|
|
if(!StringUtils.isEmpty(name)){
|
|
if(!StringUtils.isEmpty(name)){
|
|
// queryWrapper.like(Item::getName,name);
|
|
// queryWrapper.like(Item::getName,name);
|
|
- queryWrapper.and(q->q.like(Item::getName,name).or().like(Item::getNationalCode,name));
|
|
|
|
|
|
+ queryWrapper.and(q->q.like(Item::getName,name).or().like(Item::getNationalCode,name).or().like(Item::getCode,name));
|
|
}
|
|
}
|
|
if(type.equals(NumberConstant.ONE)){
|
|
if(type.equals(NumberConstant.ONE)){
|
|
queryWrapper.isNull(Item::getStandItemCode);
|
|
queryWrapper.isNull(Item::getStandItemCode);
|