Merge remote-tracking branch 'origin/master'

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -799,6 +799,7 @@
             <if test="cpId != null">
                 AND tmgc.cp_id = #{cpId}
             </if>
+            AND  tmgc.flg_valid
         </where>
         UNION ALL--父级
         SELECT
@@ -818,6 +819,7 @@
             <if test="cpId != null">
                 AND tmgc.cp_id = #{cpId}
             </if>
+            AND  tmgc.flg_valid
         </where>
         ) T
         WHERE T.cat_id IS NOT NULL
@@ -947,6 +949,7 @@
             <if test="cpId != null">
                 AND cp_id = #{cpId}
             </if>
+            AND flg_valid
         </where>
         order by display_no asc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">