Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-enterprise-service/src/main/resources/mapper/oa/LiftCertificateMapper.xml

@@ -34,12 +34,6 @@
             </if>
             <if test="cond.status != null">
                 AND lc.`status` = #{cond.status}
-            </if>
-            <if test="cond.certificateType == 1">
-                AND mcu.user_role IN (12,13)
-            </if>
-            <if test="cond.certificateType == 2">
-                AND mcu.user_role NOT IN (12,13)
             </if>
 			<if test="cond.username != null and cond.username !=''">
                 AND ui.`name` LIKE concat('%',#{cond.username},'%')
@@ -57,12 +51,6 @@
             <if test="cond.mtCompanyId != null and cond.mtCompanyId > 0">
                 AND lc.mt_company_id = #{cond.mtCompanyId}
             </if>
-            <if test="cond.mtCompanyId != null and cond.certificateType == 1">
-                AND mcu.user_role IN (12,13)
-            </if>
-            <if test="cond.mtCompanyId != null and cond.certificateType == 2">
-                AND mcu.user_role NOT IN (12,13)
-            </if>
         </where>
     </select>