Merge remote-tracking branch 'origin/feature/DM/nflg-bom-transition' into feature/DM/nflg-bom-transition

nflg_project_dev/material/src/main/java/com/nflg/product/material/pojo/query/AuthorityUserQuery.java

@@ -72,5 +72,8 @@ public class AuthorityUserQuery implements Serializable {
     @ApiModelProperty(value = "当前页")
     private Long page = 1L;
 
+    @ApiModelProperty(value = "当前选择的部门ID，查找子级数据")
+    private String parentTreeId;
+
     private static final long serialVersionUID = 1L;
 }

nflg_project_dev/material/src/main/resources/mapper/master/AuthorityUserMapper.xml

@@ -84,6 +84,11 @@
                 <if test="query.departRowId!=null ">
                     and a.depart_row_id=#{query.departRowId}
                 </if>
+
+                <if test="query.parentTreeId !=null ">
+                    and b.parent_tree LIKE concat('%',#{query.parentTreeId},'%')
+                </if>
+
             </if>
         </where>
     </select>