feat(ebom): ebom工作表，只能查看本部门的数据

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/mapper/master/BomNewEbomParentMapper.java

@@ -82,7 +82,7 @@ public interface BomNewEbomParentMapper extends BaseMapper<BomNewEbomParentEntit
 
     List<BomNewEbomParentEntity> getEBomParentByMaterialNos(@Param("job") Integer job, @Param("createdBy")String createdBy, @Param("materialNos") List<String> materialNos);
 
-    Page<BomNewEbomParentVO> workDetailsListByPageNew(Page<Object> objectPage, BomNewEbomParentQuery query, Integer userJob, String userCode);
+    Page<BomNewEbomParentVO> workDetailsListByPageNew(Page<Object> objectPage, BomNewEbomParentQuery query, Integer userJob, String userCode, Long deptRowId);
 
     List<BomNewEbomParentVO> getChildren(Long bomRowId, int type);
 

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/entity/BomNewEbomParentEntity.java

@@ -385,5 +385,12 @@ public class BomNewEbomParentEntity implements Serializable {
     @ApiModelProperty(value = "导入SAP时间")
     private LocalDateTime sapTime;
 
+    /**
+     * 创建人所属部门rowId
+     */
+    @TableField(value = "dept_row_id")
+    @ApiModelProperty(value = "创建人所属部门rowId")
+    private Long deptRowId;
+
     private static final long serialVersionUID = 265246823929418418L;
 }

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/BomNewEbomParentService.java

@@ -2224,7 +2224,8 @@ public class BomNewEbomParentService extends ServiceImpl<BomNewEbomParentMapper,
             query.setPage(1L);
             query.setPageSize(20L);
         }
-        Page<BomNewEbomParentVO> result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage(), query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode());
+        Page<BomNewEbomParentVO> result = this.getBaseMapper().workDetailsListByPageNew(new Page<>(query.getPage()
+                , query.getPageSize()), query, userRoleService.getUserJob(), SessionUtil.getUserCode(), SessionUtil.getDepartRowId());
         if (StrUtil.isBlank(query.getMaterialNo()) && StrUtil.isBlank(query.getDrawingNo())) {
             //列表搜索
             materialMainService.intiMaterialInfo(result.getRecords(), EBomConstant.EBOM_IGNORED_FIELDS_INIT_MATERIAL_DEFAULT);

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/EBom/EBomEdit.java

@@ -131,6 +131,7 @@ public class EBomEdit {
         parentEntity.setEditStatus(createDTO.getOpType());
         parentEntity.setRootIs(parentEntity.getMaterialNo().startsWith("31") ? 1 : 0);
         parentEntity.setUserRootIs(1);
+        parentEntity.setDeptRowId(SessionUtil.getDepartRowId());
 
         createDTO.getDatas().forEach(k -> {
             k.setParentRowId(parentEntity.getRowId());

nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/service/domain/OriginalBom/OriginalBomToEBomV2Convert.java

@@ -387,6 +387,7 @@ public class OriginalBomToEBomV2Convert extends BaseConvert {
             this.eBomParentResult.add(ebom);
         }
         eBomParent.setMaterialOriginalUnit(eBomParent.getMaterialUnit());
+        eBomParent.setDeptRowId(SessionUtil.getDepartRowId());
         this.eBomParentResult.add(eBomParent);
 
         return eBomParent.getRowId();

nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml

@@ -393,11 +393,13 @@
     <select id="workDetailsListByPageNew" resultType="com.nflg.product.bomnew.pojo.vo.BomNewEbomParentVO">
         SELECT *,row_id as bomRowId
         FROM t_bom_new_ebom_parent
-        <!--        WHERE (root_is=1 OR ((user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode}))-->
         <where>
             <if test="query.showMySelfOnly == 1">
                 AND created_by = #{userCode}
             </if>
+            <if test="query.showMySelfOnly == 0">
+                AND dept_row_id = #{deptRowId}
+            </if>
             <if test="userJob==0">
                 AND status IN (1,3) AND (root_is=1 OR user_root_is=1 OR root_is_for_wait_review=1) AND
                 created_by=#{userCode}

nflg_project_dev/nflg-boot-base/nflg-boot-core/src/main/java/com/nflg/product/base/core/conmon/util/SessionUtil.java

@@ -106,6 +106,10 @@ public class SessionUtil {
         return getUser().getSessionKey();
     }
 
+    public static Long getDepartRowId() {
+        return getUser().getDepartRowId();
+    }
+
     public static LoginUserInfoDTO getUser() {
         return Optional.ofNullable(BaseApi.loginUser.get())
                 .orElseThrow(() -> new NflgBusinessException(STATE.LoginError, "请登录"));