From 19bb6ffa3918901f48f44a927d4e2b3a2823c182 Mon Sep 17 00:00:00 2001
From: luoliming <luo.com>
Date: Sat, 10 Aug 2024 22:28:48 +0800
Subject: [PATCH] =?UTF-8?q?1-pbom-=E5=8D=87=E7=BA=A7=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=9C=89=E5=B7=A5=E5=8E=82=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/bomnew/service/BomNewPbomParentService.java  | 9 ++++++++-
 .../com/nflg/product/bomnew/service/UserRoleService.java | 6 +++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
index 6e0c6046..c2881a2b 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewPbomParentService.java
@@ -164,8 +164,10 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
             }
             return new Page<>();
         } else {
+            String queryFac= StrUtil.isBlank(query.getFacCode())? userRoleService.getUserFactory():query.getFacCode();
+
             Page<BomNewPbomParentVO> result = this.getBaseMapper().workDetailsListByPage(new Page<>(query.getPage()
-                    , query.getPageSize()), query, userRoleService.getUserFactory(), SessionUtil.getDepartRowId(), SessionUtil.getUserCode());
+                    , query.getPageSize()), query, queryFac, SessionUtil.getDepartRowId(), SessionUtil.getUserCode());
             materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);
             return result;
         }
@@ -1197,7 +1199,12 @@ public class BomNewPbomParentService extends ServiceImpl<BomNewPbomParentMapper,
     @Transactional(rollbackFor = Exception.class)
     public void upgrade(Long bomRowId) throws ExecutionException, InterruptedException {
         BomNewPbomParentEntity parent = this.getById(bomRowId);
+        VUtils.isTure(Objects.isNull(parent)).throwMessage("该BOM版本不存在");
         VUtils.isTure(parent.getStatus() < PBomStatusEnum.PUBLISH.getValue()).throwMessage("只有已发布的BOM，才能发起变更");
+        //检查当前用户是否有该工厂权限
+        if(!userRoleService.getUserOfFactory().contains(parent.getFacCode())){
+            VUtils.isTure(true).throwMessage("您没有该工厂的权限，无法升级");
+        }
         LogRecordContext.putVariable("bom",parent);
         PBomUpgrade upgrade = new PBomUpgrade(parent, getAllBom(bomRowId, 0));
         upgrade.upgrade();
diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserRoleService.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserRoleService.java
index fa43e501..9bdaeb5c 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserRoleService.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/UserRoleService.java
@@ -81,7 +81,11 @@ public class UserRoleService {
         if(userMultiplantFacRoleCount>0){
             return ImmutableList.of(EBomConstant.MAIN_FACTORY_CODE_1010,EBomConstant.XIAN_TAO_FACTORY_CODE_1020);
         }else {
-            return SessionUtil.getFullDeptName().contains("仙桃公司")? ImmutableList.of(EBomConstant.XIAN_TAO_FACTORY_CODE_1020) : ImmutableList.of(EBomConstant.MAIN_FACTORY_CODE_1010) ;
+            String dptCde=materialMainService.getBaseMapper().getUserDepartmentDptCode(SessionUtil.getDepartRowId());
+            if(StrUtil.isNotBlank(dptCde) && dptCde.contains("仙桃公司")){
+                return ImmutableList.of(EBomConstant.XIAN_TAO_FACTORY_CODE_1020) ;
+            }
+            return  ImmutableList.of(EBomConstant.MAIN_FACTORY_CODE_1010) ;
         }
     }