朱园亮 / xingyun-erp · Commits

Commit b7229ff83b8be917629453ab189d71c6b83fa555

Authored by yeqianyong
1 parent 7a8c72d9

楚江ERP-客户池开启权限控制

Inline Side-by-side
Showing 3 changed files with 8 additions and 2 deletions
1 package com.lframework.xingyun.basedata.mappers; 1 package com.lframework.xingyun.basedata.mappers;
2 2
  3 +import com.lframework.starter.web.core.annotations.permission.DataPermission;
  4 +import com.lframework.starter.web.core.annotations.permission.DataPermissions;
3 import com.lframework.starter.web.core.mapper.BaseMapper; 5 import com.lframework.starter.web.core.mapper.BaseMapper;
  6 +import com.lframework.starter.web.inner.components.permission.OrderDataPermissionDataPermissionType;
4 import com.lframework.xingyun.basedata.entity.Customer; 7 import com.lframework.xingyun.basedata.entity.Customer;
5 import com.lframework.xingyun.basedata.vo.customer.QueryCustomerSelectorVo; 8 import com.lframework.xingyun.basedata.vo.customer.QueryCustomerSelectorVo;
6 import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo; 9 import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo;
@@ -31,6 +34,9 @@ public interface CustomerMapper extends BaseMapper<Customer> { @@ -31,6 +34,9 @@ public interface CustomerMapper extends BaseMapper<Customer> {
31 @Sort(value = "createTime", autoParse = true), 34 @Sort(value = "createTime", autoParse = true),
32 @Sort(value = "updateTime", autoParse = true), 35 @Sort(value = "updateTime", autoParse = true),
33 }) 36 })
  37 + @DataPermissions(type = OrderDataPermissionDataPermissionType.class, value = {
  38 + @DataPermission(template = "order", alias = "c")
  39 + })
34 List<Customer> query(@Param("vo") QueryCustomerVo vo); 40 List<Customer> query(@Param("vo") QueryCustomerVo vo);
35 41
36 /** 42 /**
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 create_time, 53 create_time,
54 update_by, 54 update_by,
55 update_time 55 update_time
56 - FROM base_data_customer 56 + FROM base_data_customer c
57 </sql> 57 </sql>
58 58
59 <select id="query" resultMap="CustomerDto"> 59 <select id="query" resultMap="CustomerDto">
@@ -283,7 +283,7 @@ public class PurchaseOrderServiceImpl extends BaseMpServiceImpl<PurchaseOrderMap @@ -283,7 +283,7 @@ public class PurchaseOrderServiceImpl extends BaseMpServiceImpl<PurchaseOrderMap
283 if (!config.getPurchaseRequireBpm()) { 283 if (!config.getPurchaseRequireBpm()) {
284 throw new DefaultClientException("已关闭审批流程，无法重新发起该订单！"); 284 throw new DefaultClientException("已关闭审批流程，无法重新发起该订单！");
285 } 285 }
286 - if (!flowInstanceWrapperService.canRestart(order.getId())) { 286 + if (!flowInstanceWrapperService.canRestart(order.getId(), null)) {
287 throw new DefaultClientException("订单不允许重新发起！"); 287 throw new DefaultClientException("订单不允许重新发起！");
288 } 288 }
289 LambdaUpdateWrapper<PurchaseOrderForm> updateOrderWrapper = Wrappers.lambdaUpdate( 289 LambdaUpdateWrapper<PurchaseOrderForm> updateOrderWrapper = Wrappers.lambdaUpdate(