diff --git a/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java b/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java index 9458160..cd67c2c 100644 --- a/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java +++ b/src/main/java/com/yxt/supplier/apiadmin/SupplierInfoRest.java @@ -61,8 +61,7 @@ public class SupplierInfoRest { @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = SupplierInfoService.listPageVo(pq); - return rb.success().setData(pv); + return SupplierInfoService.listPageVo(pq); } @ApiOperation("新增或修改或") diff --git a/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java b/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java index 02f8625..9d78307 100644 --- a/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java +++ b/src/main/java/com/yxt/supplier/apiadmin/SupplierTypeRest.java @@ -61,8 +61,7 @@ public class SupplierTypeRest { @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ ResultBean rb = ResultBean.fireFail(); - PagerVo pv = supplierTypeService.listPageVo(pq); - return rb.success().setData(pv); + return supplierTypeService.listPageVo(pq); } @ApiOperation("新增或修改") diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDetailsVo.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDetailsVo.java index 4513198..a684400 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDetailsVo.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDetailsVo.java @@ -113,4 +113,6 @@ public class SupplierInfoDetailsVo implements Vo { private String createOrgSid; // 创建组织sid @ApiModelProperty("供应商开户行") private List baseSupplierBankList; + private String userSid; + private String orgPath; } \ No newline at end of file diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDto.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDto.java index 576148c..d9ab6e0 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDto.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoDto.java @@ -113,4 +113,6 @@ public class SupplierInfoDto implements Dto { private String createOrgSid; // 创建组织sid @ApiModelProperty("开户行信息") private List baseSupplierBankList; + private String userSid; + private String orgPath; } \ No newline at end of file diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.java index ca019bf..9d3dbe5 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.java @@ -53,7 +53,7 @@ import java.util.List; public interface SupplierInfoMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - + List listAll(@Param("orgPath")String orgPath); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from supplier_info") diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.xml b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.xml index 6ff4e6b..bc756da 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.xml +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoMapper.xml @@ -4,9 +4,19 @@ + - diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoQuery.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoQuery.java index 464a4f1..7a4da8a 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoQuery.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoQuery.java @@ -59,4 +59,12 @@ public class SupplierInfoQuery implements Query { @ApiModelProperty("其他查询条件") private String otherQuery; + private String orgLevelKey;// + private int index;//下标 + @ApiModelProperty("菜单路由") + private String menuUrl; + @ApiModelProperty("组织全路径sid") + private String orgPath; + @ApiModelProperty("用户sid") + private String userSid; } diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java index f9a4318..6d24b5d 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoService.java @@ -41,6 +41,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -62,9 +63,35 @@ public class SupplierInfoService extends MybatisBaseService listPageVo(PagerQuery pq) { + public ResultBean> listPageVo(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); SupplierInfoQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper(); + + if (com.yxt.common.base.utils.StringUtils.isNotBlank(query.getOrgLevelKey())) { + //数据权限ID(1全部、2本部门及子部门、3本部门、4个人) + String orgLevelKey=query.getOrgLevelKey(); + String orgSidPath=query.getOrgPath(); + int index=query.getIndex(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.like("s.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.like("s.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, index); + qw.apply("s.orgSidPath like('"+orgSidPath+"')"); + } else if ("4".equals(orgLevelKey)) { + qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } if (StringUtils.isNotBlank(query.getSupplierName())){ qw.like("supplierName",query.getSupplierName()); } @@ -84,7 +111,7 @@ public class SupplierInfoService extends MybatisBaseService page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; + return rb.success().setData(p); } public ResultBean saveOrUpdateDto(SupplierInfoDto dto){ @@ -123,6 +150,9 @@ public class SupplierInfoService extends MybatisBaseService supplierBankDetailsVos = supplierBankService.selectBySupplierSid(sid); vo.setBaseSupplierBankList(supplierBankDetailsVos); + vo.setOrgPath(vo.getUseOrgSid()); return vo; } diff --git a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoVo.java b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoVo.java index ab746a1..cb8f5bb 100644 --- a/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoVo.java +++ b/src/main/java/com/yxt/supplier/biz/supplierinfo/SupplierInfoVo.java @@ -62,4 +62,8 @@ public class SupplierInfoVo implements Vo { private String contactName; @ApiModelProperty("手机") private String contactMobile; + private String useOrgSid; + private String createOrgSid;//创建组织sid + private String userSid; + private String orgPath; } diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDetailsVo.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDetailsVo.java index a98c9ad..2177715 100644 --- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDetailsVo.java +++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDetailsVo.java @@ -59,5 +59,7 @@ public class SupplierTypeDetailsVo implements Vo { private String createOrgName; // 创建组织名称 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + private String userSid; + private String orgPath; } \ No newline at end of file diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDto.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDto.java index c0f013c..d838aca 100644 --- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDto.java +++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeDto.java @@ -60,5 +60,7 @@ public class SupplierTypeDto implements Dto { private String createOrgName; // 创建组织名称 @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid + private String userSid; + private String orgPath; } \ No newline at end of file diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java index 7f5a99b..2c2f384 100644 --- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java +++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.java @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.supplier.biz.supplierinfo.SupplierInfoVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -52,7 +53,7 @@ import java.util.List; public interface SupplierTypeMapper extends BaseMapper { IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); - + List listAll(@Param("orgPath")String orgPath); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @Select("select * from supplier_type") diff --git a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.xml b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.xml index baea489..6caf8aa 100644 --- a/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.xml +++ b/src/main/java/com/yxt/supplier/biz/suppliertype/SupplierTypeMapper.xml @@ -4,7 +4,18 @@ +