From 61002236b1d4370ef877a83bb7efc30cef9d14fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Fri, 14 Apr 2023 13:34:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../materialvo/service/impl/MaterialServiceImpl.java  | 11 +++++++++--
 .../main/resources/mapper/material/MaterialMapper.xml |  1 +
 .../scm/basicInformation/tradeupload/MaterialBox.vue  |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java
index ccaf14c9..fa9fd2c5 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/materialvo/service/impl/MaterialServiceImpl.java
@@ -146,7 +146,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
         boolean	isPc = ServletUtil.getHeader("jnpf-origin").equals("pc");
         if(isPc && pcPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
+                Object materialObj=authorizeService.getCondition2(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
                 if (ObjectUtil.isEmpty(materialObj)){
                     return new ArrayList<>();
                 } else {
@@ -157,7 +157,7 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
         }
         if(!isPc && appPermission){
             if (!userProvider.get().getIsAdministrator()){
-                Object materialObj=authorizeService.getCondition(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
+                Object materialObj=authorizeService.getCondition2(new AuthorizeConditionModel(materialQueryWrapper,materialPagination.getMenuId(),"jg_material"));
                 if (ObjectUtil.isEmpty(materialObj)){
                     return new ArrayList<>();
                 } else {
@@ -215,6 +215,13 @@ public class MaterialServiceImpl extends ServiceImpl<MaterialMapper, MaterialEnt
             }
         }
         Page<MaterialEntity> page=new Page<>(materialPagination.getCurrentPage(), materialPagination.getPageSize());
+        String organized=null;
+        if (!userProvider.get().getIsAdministrator()) {
+            organized = userProvider.getOrganizeId(userId);
+        }
+        if (StringUtil.isNotNull(organized)) {
+            materialPagination.setOrgnizeId(organized);
+        }
         IPage<MaterialEntity> userIPage= materialMapper.queryMaterial(page,materialPagination, materialQueryWrapper);
         return materialPagination.setData(userIPage.getRecords(),userIPage.getTotal());
     }
diff --git a/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml b/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml
index e57ef2b1..0c59efcd 100644
--- a/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml
+++ b/SC-boot/linkage-scm/src/main/resources/mapper/material/MaterialMapper.xml
@@ -110,6 +110,7 @@
     <select id="queryMaterial" resultType="jnpf.materialvo.entity.MaterialEntity">
         SELECT
         	a.*,
+        	a.primary_unit_of_measure primaryUnitOmeasure,
         	b.areaname inAreaName,
         	c.areaname outAreaName
         FROM
diff --git a/SC-web/src/views/scm/basicInformation/tradeupload/MaterialBox.vue b/SC-web/src/views/scm/basicInformation/tradeupload/MaterialBox.vue
index d2b0989f..2484f6aa 100644
--- a/SC-web/src/views/scm/basicInformation/tradeupload/MaterialBox.vue
+++ b/SC-web/src/views/scm/basicInformation/tradeupload/MaterialBox.vue
@@ -106,7 +106,7 @@
 				this.listQuery.menuId = '380611389670053189'
 				let listQuery = this.listQuery
 				request({
-					url: `/api/example/Material/getList`,
+					url: `/api/example/Material/getListPC`,
 					method: 'post',
 					data: listQuery
 				}).then(res => {