diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java index c58737e89..6662305cf 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSupplierTypeController.java @@ -129,7 +129,7 @@ public class SmErpSupplierTypeController { @Operation(summary = "下拉查询" ) @GetMapping("/simpleAll") public R getSimpleAll() { - List list = smErpSupplierTypeService.list(); + List list = smErpSupplierTypeService.selectSimpleAllScope(); List bean = BeanUtils.toBean(list, SmErpSupplierTypeSimpleVo.class); return R.ok(bean); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java index f32212235..2cef9f322 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSupplierTypeService.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity; +import java.util.List; + public interface SmErpSupplierTypeService extends IService { @@ -16,4 +18,7 @@ public interface SmErpSupplierTypeService extends IService wrapper); + + + List selectSimpleAllScope(); } \ No newline at end of file diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java index 6f4d2d81f..bf703cac8 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSupplierTypeServiceImpl.java @@ -7,7 +7,11 @@ import com.bsd.pjcloud.common.data.datascope.DataScope; import com.bsd.pjcloud.supermarket.entity.SmErpSupplierTypeEntity; import com.bsd.pjcloud.supermarket.mapper.SmErpSupplierTypeMapper; import com.bsd.pjcloud.supermarket.service.SmErpSupplierTypeService; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; + +import java.util.List; + /** * 货商类别 * @@ -20,4 +24,9 @@ public class SmErpSupplierTypeServiceImpl extends ServiceImpl wrapper) { return baseMapper.selectPageByScope(page,wrapper, DataScope.of()); } + + @Override + public List selectSimpleAllScope() { + return baseMapper.selectListByScope(null, DataScope.of()); + } } \ No newline at end of file