diff --git a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
index 5aaa042f..a085a7e9 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
+++ b/nflg_project_dev/nflg-bom-new/src/main/java/com/nflg/product/bomnew/pojo/query/BomNewEbomParentQuery.java
@@ -6,8 +6,6 @@ import lombok.Data;
import lombok.experimental.Accessors;
import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
/**
* t_bom_new_ebom_parent
@@ -33,8 +31,6 @@ public class BomNewEbomParentQuery extends BasePageQuery implements Serializabl
@ApiModelProperty(value = "物料编码")
private String materialNo;
-
-
/**
* 设计人员名称
*/
@@ -50,9 +46,11 @@ public class BomNewEbomParentQuery extends BasePageQuery implements Serializabl
@ApiModelProperty("数据类型 0-EBOM工作列表数据 1-EBOM正式工作表明细 2-变更影响")
private Integer dataType=0;
+ /*
+ * 是否仅显示自己的数据:0=所有人的数据;1=仅自己的数据,默认为0
+ */
+ @ApiModelProperty(value = "是否仅显示自己的数据:0=所有人的数据;1=仅自己的数据,默认为0")
+ private Integer showMySelfOnly = 0;
-
-
-
private static final long serialVersionUID = 1L;
}
diff --git a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
index b3043205..e391f8da 100644
--- a/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
+++ b/nflg_project_dev/nflg-bom-new/src/main/resources/mapper/master/BomNewEbomParentMapper.xml
@@ -187,11 +187,19 @@
@@ -385,6 +393,9 @@
SELECT *,row_id as bomRowId
FROM t_bom_new_ebom_parent
+
+ AND created_by = #{userCode}
+
WHERE status IN (1,3) AND (user_root_is=1 OR root_is_for_wait_review=1) AND created_by=#{userCode}