xignzi006 发布系统代码 [Spring Boot]

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/domain/Account_account.java

@@ -207,7 +207,7 @@ public class Account_account extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -343,14 +343,6 @@ public class Account_account extends EntityMP implements Serializable {
         this.modify("name",name);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [组]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_account/domain/Account_tax.java

@@ -258,7 +258,7 @@ public class Account_tax extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -410,14 +410,6 @@ public class Account_tax extends EntityMP implements Serializable {
         this.modify("tax_group_id",taxGroupId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/domain/Res_supplier.java

@@ -155,7 +155,7 @@ public class Res_supplier extends EntityMP implements Serializable {
     /**
      * ID
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -556,14 +556,6 @@ public class Res_supplier extends EntityMP implements Serializable {
         this.modify("title",title);
     }
 
-    /**
-     * 设置 [ID]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [ID]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/IRes_supplierService.java

@@ -83,6 +83,8 @@ public interface IRes_supplierService extends IService<Res_supplier>{
      */
     boolean execute(String sql, Map param);
 
+    List<Res_supplier> getResSupplierByIds(List<Long> ids) ;
+    List<Res_supplier> getResSupplierByEntities(List<Res_supplier> entities) ;
 }
 
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_base/service/impl/Res_supplierServiceImpl.java

@@ -591,6 +591,25 @@ public class Res_supplierServiceImpl extends EBSServiceImpl<Res_supplierMapper,
         return true;
     }
 
+    @Override
+    public List<Res_supplier> getResSupplierByIds(List<Long> ids) {
+         return this.listByIds(ids);
+    }
+
+    @Override
+    public List<Res_supplier> getResSupplierByEntities(List<Res_supplier> entities) {
+        List ids =new ArrayList();
+        for(Res_supplier entity : entities){
+            Serializable id=entity.getId();
+            if(!ObjectUtils.isEmpty(id)){
+                ids.add(id);
+            }
+        }
+        if(ids.size()>0)
+           return this.listByIds(ids);
+        else
+           return entities;
+    }
 
 
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/domain/Product_supplierinfo.java

@@ -215,7 +215,7 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -433,14 +433,6 @@ public class Product_supplierinfo extends EntityMP implements Serializable {
         this.modify("product_tmpl_id",productTmplId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [产品变体]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_product/domain/Product_template.java

@@ -1179,7 +1179,7 @@ public class Product_template extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -1691,14 +1691,6 @@ public class Product_template extends EntityMP implements Serializable {
         this.modify("description_sale",descriptionSale);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [产品种类]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/domain/Stock_location.java

@@ -256,7 +256,7 @@ public class Stock_location extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -432,14 +432,6 @@ public class Stock_location extends EntityMP implements Serializable {
         this.modify("valuation_in_account_id",valuationInAccountId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [库存计价科目（出向）]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/domain/Stock_move.java

@@ -877,7 +877,7 @@ public class Stock_move extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -1529,14 +1529,6 @@ public class Stock_move extends EntityMP implements Serializable {
         this.modify("location_id",locationId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
 
     @Override
     public Serializable getDefaultKey(boolean gen) {

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/domain/Stock_picking.java

@@ -604,7 +604,7 @@ public class Stock_picking extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -898,14 +898,6 @@ public class Stock_picking extends EntityMP implements Serializable {
         this.modify("owner_id",ownerId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [源位置]
      */

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_stock/domain/Stock_warehouse.java

@@ -539,7 +539,7 @@ public class Stock_warehouse extends EntityMP implements Serializable {
     /**
      * 公司
      */
-    @DEField(name = "company_id")
+    @DEField(name = "company_id" , preType = DEPredefinedFieldType.ORGID)
     @TableField(value = "company_id")
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
@@ -1051,14 +1051,6 @@ public class Stock_warehouse extends EntityMP implements Serializable {
         this.modify("partner_id",partnerId);
     }
 
-    /**
-     * 设置 [公司]
-     */
-    public void setCompanyId(Long companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [收货路线]
      */

businesscentral-core/src/main/resources/sysmodel/iBizBusinessCentral.json

@@ -830,6 +830,7 @@
     "nullable":0,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -27882,6 +27883,7 @@
     "nullable":0,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -122122,6 +122124,7 @@
     "nullable":1,
     "physical_field":0,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -125588,6 +125591,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -128011,6 +128015,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -153774,6 +153779,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -174519,6 +174525,7 @@
     "nullable":1,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -177169,6 +177176,7 @@
     "nullable":0,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -180510,6 +180518,7 @@
     "nullable":0,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0
@@ -187526,6 +187535,7 @@
     "nullable":0,
     "physical_field":1,
     "data_type":"BIGINT",
+    "predefined":"ORGID",
     "key_field":0,
     "show_order":1000,
     "major_field":0

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Account_accountDTO.java

@@ -232,7 +232,6 @@ public class Account_accountDTO extends DTOBase implements Serializable {
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "[公司]不允许为空!")
     private Long companyId;
 
     /**
@@ -322,14 +321,6 @@ public class Account_accountDTO extends DTOBase implements Serializable {
         this.modify("name",name);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [GROUP_ID]
      */

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Account_taxDTO.java

@@ -287,7 +287,6 @@ public class Account_taxDTO extends DTOBase implements Serializable {
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "[公司]不允许为空!")
     private Long companyId;
 
 
@@ -395,14 +394,6 @@ public class Account_taxDTO extends DTOBase implements Serializable {
         this.modify("tax_group_id",taxGroupId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
 
 }
 

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Product_supplierinfoDTO.java

@@ -371,14 +371,6 @@ public class Product_supplierinfoDTO extends DTOBase implements Serializable {
         this.modify("product_tmpl_id",productTmplId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [PRODUCT_ID]
      */

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Product_templateDTO.java

@@ -1825,14 +1825,6 @@ public class Product_templateDTO extends DTOBase implements Serializable {
         this.modify("description_sale",descriptionSale);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [CATEG_ID]
      */

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Res_supplierDTO.java

@@ -495,14 +495,6 @@ public class Res_supplierDTO extends DTOBase implements Serializable {
         this.modify("title",title);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [COUNTRY_ID]
      */

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Stock_locationDTO.java

@@ -409,14 +409,6 @@ public class Stock_locationDTO extends DTOBase implements Serializable {
         this.modify("valuation_in_account_id",valuationInAccountId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [VALUATION_OUT_ACCOUNT_ID]
      */

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Stock_moveDTO.java

@@ -1026,7 +1026,6 @@ public class Stock_moveDTO extends DTOBase implements Serializable {
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "[公司]不允许为空!")
     private Long companyId;
 
     /**
@@ -1423,14 +1422,6 @@ public class Stock_moveDTO extends DTOBase implements Serializable {
         this.modify("location_id",locationId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
 
 }
 

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Stock_pickingDTO.java

@@ -695,7 +695,6 @@ public class Stock_pickingDTO extends DTOBase implements Serializable {
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "[公司]不允许为空!")
     private Long companyId;
 
     /**
@@ -878,14 +877,6 @@ public class Stock_pickingDTO extends DTOBase implements Serializable {
         this.modify("owner_id",ownerId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [LOCATION_ID]
      */

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/dto/Stock_warehouseDTO.java

@@ -631,7 +631,6 @@ public class Stock_warehouseDTO extends DTOBase implements Serializable {
     @JSONField(name = "company_id")
     @JsonProperty("company_id")
     @JsonSerialize(using = ToStringSerializer.class)
-    @NotNull(message = "[公司]不允许为空!")
     private Long companyId;
 
     /**
@@ -917,14 +916,6 @@ public class Stock_warehouseDTO extends DTOBase implements Serializable {
         this.modify("partner_id",partnerId);
     }
 
-    /**
-     * 设置 [COMPANY_ID]
-     */
-    public void setCompanyId(Long  companyId){
-        this.companyId = companyId ;
-        this.modify("company_id",companyId);
-    }
-
     /**
      * 设置 [RECEPTION_ROUTE_ID]
      */

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/rest/Res_supplierResource.java

@@ -47,7 +47,7 @@ public class Res_supplierResource {
     @Lazy
     public Res_supplierMapping res_supplierMapping;
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Create-all')")
+    @PreAuthorize("hasPermission(this.res_supplierMapping.toDomain(#res_supplierdto),'iBizBusinessCentral-Res_supplier-Create')")
     @ApiOperation(value = "新建供应商", tags = {"供应商" },  notes = "新建供应商")
 	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers")
     public ResponseEntity<Res_supplierDTO> create(@Validated @RequestBody Res_supplierDTO res_supplierdto) {
@@ -57,7 +57,7 @@ public class Res_supplierResource {
 		return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Create-all')")
+    @PreAuthorize("hasPermission(this.res_supplierMapping.toDomain(#res_supplierdtos),'iBizBusinessCentral-Res_supplier-Create')")
     @ApiOperation(value = "批量新建供应商", tags = {"供应商" },  notes = "批量新建供应商")
 	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/batch")
     public ResponseEntity<Boolean> createBatch(@RequestBody List<Res_supplierDTO> res_supplierdtos) {
@@ -65,7 +65,7 @@ public class Res_supplierResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Update-all')")
+    @PreAuthorize("hasPermission(this.res_supplierService.get(#res_supplier_id),'iBizBusinessCentral-Res_supplier-Update')")
     @ApiOperation(value = "更新供应商", tags = {"供应商" },  notes = "更新供应商")
 	@RequestMapping(method = RequestMethod.PUT, value = "/res_suppliers/{res_supplier_id}")
     public ResponseEntity<Res_supplierDTO> update(@PathVariable("res_supplier_id") Long res_supplier_id, @RequestBody Res_supplierDTO res_supplierdto) {
@@ -76,7 +76,7 @@ public class Res_supplierResource {
         return ResponseEntity.status(HttpStatus.OK).body(dto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Update-all')")
+    @PreAuthorize("hasPermission(this.res_supplierService.getResSupplierByEntities(this.res_supplierMapping.toDomain(#res_supplierdtos)),'iBizBusinessCentral-Res_supplier-Update')")
     @ApiOperation(value = "批量更新供应商", tags = {"供应商" },  notes = "批量更新供应商")
 	@RequestMapping(method = RequestMethod.PUT, value = "/res_suppliers/batch")
     public ResponseEntity<Boolean> updateBatch(@RequestBody List<Res_supplierDTO> res_supplierdtos) {
@@ -84,14 +84,14 @@ public class Res_supplierResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Remove-all')")
+    @PreAuthorize("hasPermission(this.res_supplierService.get(#res_supplier_id),'iBizBusinessCentral-Res_supplier-Remove')")
     @ApiOperation(value = "删除供应商", tags = {"供应商" },  notes = "删除供应商")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/res_suppliers/{res_supplier_id}")
     public ResponseEntity<Boolean> remove(@PathVariable("res_supplier_id") Long res_supplier_id) {
          return ResponseEntity.status(HttpStatus.OK).body(res_supplierService.remove(res_supplier_id));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Remove-all')")
+    @PreAuthorize("hasPermission(this.res_supplierService.getResSupplierByIds(#ids),'iBizBusinessCentral-Res_supplier-Remove')")
     @ApiOperation(value = "批量删除供应商", tags = {"供应商" },  notes = "批量删除供应商")
 	@RequestMapping(method = RequestMethod.DELETE, value = "/res_suppliers/batch")
     public ResponseEntity<Boolean> removeBatch(@RequestBody List<Long> ids) {
@@ -99,7 +99,7 @@ public class Res_supplierResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Get-all')")
+    @PostAuthorize("hasPermission(this.res_supplierMapping.toDomain(returnObject.body),'iBizBusinessCentral-Res_supplier-Get')")
     @ApiOperation(value = "获取供应商", tags = {"供应商" },  notes = "获取供应商")
 	@RequestMapping(method = RequestMethod.GET, value = "/res_suppliers/{res_supplier_id}")
     public ResponseEntity<Res_supplierDTO> get(@PathVariable("res_supplier_id") Long res_supplier_id) {
@@ -131,14 +131,14 @@ public class Res_supplierResource {
         return ResponseEntity.status(HttpStatus.OK).body(res_supplierdto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Save-all')")
+    @PreAuthorize("hasPermission(this.res_supplierMapping.toDomain(#res_supplierdto),'iBizBusinessCentral-Res_supplier-Save')")
     @ApiOperation(value = "保存供应商", tags = {"供应商" },  notes = "保存供应商")
 	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/save")
     public ResponseEntity<Boolean> save(@RequestBody Res_supplierDTO res_supplierdto) {
         return ResponseEntity.status(HttpStatus.OK).body(res_supplierService.save(res_supplierMapping.toDomain(res_supplierdto)));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-Save-all')")
+    @PreAuthorize("hasPermission(this.res_supplierMapping.toDomain(#res_supplierdtos),'iBizBusinessCentral-Res_supplier-Save')")
     @ApiOperation(value = "批量保存供应商", tags = {"供应商" },  notes = "批量保存供应商")
 	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/savebatch")
     public ResponseEntity<Boolean> saveBatch(@RequestBody List<Res_supplierDTO> res_supplierdtos) {
@@ -146,7 +146,7 @@ public class Res_supplierResource {
         return  ResponseEntity.status(HttpStatus.OK).body(true);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-searchDefault-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Res_supplier-Get')")
 	@ApiOperation(value = "获取数据集", tags = {"供应商" } ,notes = "获取数据集")
     @RequestMapping(method= RequestMethod.GET , value="/res_suppliers/fetchdefault")
 	public ResponseEntity<List<Res_supplierDTO>> fetchDefault(Res_supplierSearchContext context) {
@@ -159,7 +159,7 @@ public class Res_supplierResource {
                 .body(list);
 	}
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-searchDefault-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Res_supplier-searchDefault-all') and hasPermission(#context,'iBizBusinessCentral-Res_supplier-Get')")
 	@ApiOperation(value = "查询数据集", tags = {"供应商" } ,notes = "查询数据集")
     @RequestMapping(method= RequestMethod.POST , value="/res_suppliers/searchdefault")
 	public ResponseEntity<Page<Res_supplierDTO>> searchDefault(@RequestBody Res_supplierSearchContext context) {