朱兆平 / spring cloud基础开发框架 · 提交

转到一个项目

作者 朱兆平
提交 48583c0f9b1a0a460bcd84f332e6945007f420cf 1 个父辈 66812773

组织机构查询接口sql优化失败,暂时回撤到正常版本.

内嵌 并排对比
正在显示 2 个修改的文件 包含 7 行增加 和 3 行删除
... ... @@ -47,7 +47,7 @@ public class RoleServiceImp implements RoleService{
@Override
public PageInfo<ROLE> findAll(int pageNum, int pageSize, String roleName, String type){
Page<ROLE> page = PageHelper.startPage(pageNum,pageSize);
List<ROLE> list = roleMapper.findAllWithChildAndTree(roleName, type);
List<ROLE> list = roleMapper.findAll(roleName, type);
// List<ROLE> treeList = list.stream()
// .filter(role -> role.getParentid() == 0)
... ...
... ... @@ -14,6 +14,10 @@
<result column="departmentId" jdbcType="VARCHAR" property="departmentid" />
<result column="mq_code" jdbcType="VARCHAR" property="mqcode" />
</resultMap>
<resultMap id="TreeSqlWithPermResultMap" type="com.tianbo.warehouse.model.ROLE" extends="BaseResultMap">
<collection column="role_id" javaType="java.util.ArrayList" ofType="com.tianbo.warehouse.model.PERMISSION" property="permissions" select="com.tianbo.warehouse.dao.PERMISSIONMapper.getRolePermisson" />
<collection column="role_id" property="children" select="selectByParentId" />
</resultMap>
<resultMap id="TreeWithPermResultMap" type="com.tianbo.warehouse.model.ROLE" extends="BaseResultMap">
<collection javaType="java.util.ArrayList" ofType="com.tianbo.warehouse.model.PERMISSION" property="permissions">
<result column="permission_id" property="permissionId" jdbcType="INTEGER" />
... ... @@ -44,7 +48,7 @@
from role
where role_id = #{roleId,jdbcType=INTEGER}
</select>
<select id="selectByParentId" parameterType="java.lang.Integer" resultMap="TreeWithPermResultMap">
<select id="selectByParentId" parameterType="java.lang.Integer" resultMap="TreeSqlWithPermResultMap">
select
<include refid="Base_Column_List" />
from role
... ... @@ -223,7 +227,7 @@ WHERE
where role_id = #{roleId,jdbcType=INTEGER}
</update>
<select id="findAll" parameterType="java.lang.String" resultMap="TreeWithPermResultMap">
<select id="findAll" parameterType="java.lang.String" resultMap="TreeSqlWithPermResultMap">
SELECT
<include refid="Base_Column_List" />
FROM role
... ...