|
@@ -8,10 +8,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.fjhx.common.utils.Assert;
|
|
|
import com.fjhx.customer.service.customer.CustomerService;
|
|
|
-import com.fjhx.sale.entity.contract.po.Contract;
|
|
|
-import com.fjhx.sale.entity.documents.dto.DocumentsSelectDto;
|
|
|
-import com.fjhx.sale.entity.documents.po.Documents;
|
|
|
-import com.fjhx.sale.entity.documents.vo.DocumentsVo;
|
|
|
import com.fjhx.sale.entity.pack.dto.PackDetailDto;
|
|
|
import com.fjhx.sale.entity.pack.dto.PackDetailSelectDto;
|
|
|
import com.fjhx.sale.entity.pack.enums.PackShipmentStatusEnum;
|
|
@@ -21,13 +17,10 @@ import com.fjhx.sale.entity.pack.vo.PackDetailVo;
|
|
|
import com.fjhx.sale.mapper.pack.PackDetailMapper;
|
|
|
import com.fjhx.sale.service.pack.PackDetailService;
|
|
|
import com.fjhx.sale.service.pack.PackShipmentService;
|
|
|
-import com.ruoyi.common.core.domain.entity.SysUser;
|
|
|
import com.ruoyi.common.exception.ServiceException;
|
|
|
-import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.StringUtils;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
import com.ruoyi.system.service.ISysUserService;
|
|
|
-import com.ruoyi.system.utils.UserUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -66,17 +59,18 @@ public class PackDetailServiceImpl extends ServiceImpl<PackDetailMapper, PackDet
|
|
|
@Override
|
|
|
public Page<PackDetailVo> getPage(PackDetailSelectDto dto) {
|
|
|
IWrapper<PackDetail> wrapper = getWrapper();
|
|
|
- SysUser sysUser = UserUtil.getUserInfo();
|
|
|
- if(StringUtils.isEmpty(sysUser.getUserCode())){//不是业务员看所有
|
|
|
- return pageCommon(dto, wrapper);
|
|
|
- }else{//是业务员
|
|
|
- List<Long> authIdList = customerService.getAuthIdList();
|
|
|
- if (authIdList.size() == 0) {
|
|
|
- return new Page<>();
|
|
|
- }
|
|
|
- wrapper.in("pd.customerIds", authIdList);
|
|
|
- return pageCommon(dto, wrapper);
|
|
|
- }
|
|
|
+// SysUser sysUser = UserUtil.getUserInfo();
|
|
|
+// if(StringUtils.isEmpty(sysUser.getUserCode())){//不是业务员看所有
|
|
|
+// return pageCommon(dto, wrapper);
|
|
|
+// }else{//是业务员
|
|
|
+// List<Long> authIdList = customerService.getAuthIdList();
|
|
|
+// if (authIdList.size() == 0) {
|
|
|
+// return new Page<>();
|
|
|
+// }
|
|
|
+// wrapper.in("pd.customerIds", authIdList);
|
|
|
+// return pageCommon(dto, wrapper);
|
|
|
+// }
|
|
|
+ return pageCommon(dto, wrapper);
|
|
|
}
|
|
|
|
|
|
public Page<PackDetailVo> pageCommon(PackDetailSelectDto dto, IWrapper<PackDetail> wrapper){
|