diff --git a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java index 391a1b9..4faf530 100644 --- a/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java +++ b/src/main/java/com/yxt/purchase/apiadmin/PurchaseBillRest.java @@ -45,17 +45,13 @@ public class PurchaseBillRest { @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") public ResultBean> listPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = purchaseBillService.listPageVo(pq); - return rb.success().setData(pv); + return purchaseBillService.listPageVo(pq); } @ApiOperation("采购订单审核管理") @PostMapping("/exlistPage") public ResultBean> exlistPage(@RequestBody PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - PagerVo pv = purchaseBillService.exlistPage(pq); - return rb.success().setData(pv); + return purchaseBillService.exlistPage(pq); } @ApiOperation("新增或修改") diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml index 7585625..fe898fc 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillMapper.xml @@ -39,6 +39,7 @@ ON pbe.billSid = pb.`sid` LEFT JOIN purchase_bill_amount pba ON pba.`billSid` = pb.`sid` + LEFT JOIN ss_user.sys_organization as s ON pb.useOrgSid = s.sid ${ew.sqlSegment} @@ -69,6 +70,7 @@ ON pbe.billSid = pb.`sid` LEFT JOIN purchase_bill_amount pba ON pba.`billSid` = pb.`sid` + LEFT JOIN ss_user.sys_organization as s ON pb.useOrgSid = s.sid ${ew.sqlSegment} diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java index 4f47cca..594bde2 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java @@ -57,11 +57,12 @@ public class PurchaseBillQuery implements Query { @ApiModelProperty("商品sid") private String goodsSid; - private String orgLevelKey; + private String orgLevelKey;//权限等级 @ApiModelProperty("菜单路由") private String menuUrl; @ApiModelProperty("组织全路径sid") private String orgPath; @ApiModelProperty("用户sid") private String userSid; + private int index; } diff --git a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java index 2e404f3..86946f1 100644 --- a/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java +++ b/src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java @@ -75,10 +75,34 @@ public class PurchaseBillService extends MybatisBaseService listPageVo(PagerQuery pq) { + public ResultBean> listPageVo(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); PurchaseBillQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("pb.deptSid","3042d730-64e8-4e34-b08a-44adca4da3a5"); + 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("pb.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.getSupplierSid())) { qw.eq("pb.supplierSid", query.getSupplierSid()); } @@ -111,17 +135,42 @@ public class PurchaseBillService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); - qw.orderByDesc("pb.createTime"); qw.groupBy("pb.sid"); + qw.orderByDesc("pb.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.selectPageVo(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; + return rb.success().setData(p); } - public PagerVo exlistPage(PagerQuery pq) { + public ResultBean> exlistPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); PurchaseBillQuery 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("pb.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } + } else { + PagerVo p = new PagerVo<>(); + return rb.success().setData(p); + } qw.ne("pb.state", "0"); if (StringUtils.isNotBlank(query.getSupplierSid())) { qw.eq("pb.supplierSid", query.getSupplierSid()); @@ -155,12 +204,12 @@ public class PurchaseBillService extends MybatisBaseService= date_format('" + createStartTime + "','%Y-%m-%d')"). apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')" ); - qw.orderByDesc("pb.createTime"); qw.groupBy("pb.sid"); + qw.orderByDesc("pb.createTime"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.exlistPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); - return p; + return rb.success().setData(p); } public String saveOrUpdateDto(PurchaseBillDto dto) {