Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

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

@@ -905,6 +905,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">