Merge branch 'developer' into hive2.0

Helius

2022-05-27 4351e71d782741143a98f86f6648acd16689165f

 zq-erp/src/main/resources/mybatis/mapper/common/SysRolePwoerFnDao.xml

@@ -150,10 +150,21 @@
      </if>
      </where>
   </delete>
	
	
	
   <!-- 分页查询 -->
    <delete id="deleteByFns">
      DELETE a
      FROM
      sys_role_pwoer_fn a , sys_role b
      WHERE
      a.role_id = b.role_id
      and b.company_id=#{companyId}
      and a.fn_id in <foreach collection="list" index="index" item="item" open="("
                            separator="," close=")">
      #{item}
   </foreach>
   </delete>


    <!-- 分页查询 -->
   <select id="selectInPage" resultMap="SysRolePwoerFnMap">
      select 
         rpf_id,