Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

chenlu

109 分钟以前 3247273b3505b42c400251ee2fc0921affaadf40

 north-glass-erp/src/main/resources/mapper/userInfo/PermissionRoleMapper.xml

@@ -28,7 +28,7 @@
                    if(d.page=null || d.page='','',concat(d.page, '.')),
                    d.permission
                ) as 'permission'
        <if test="loginId!=1">
        <if test="userIsAdmin==false">
        from user as a
                 left join user_role as e
                           on e.user_id = a.id
@@ -38,15 +38,14 @@
                           on b.id = c.role_id
                 left join permission_basic d
                           on  d.id = c.permission_id
                           and d.permission='edit'
        where a.id = #{loginId}
        where a.id = #{loginId} and

        </if>
        <if test="loginId==1">
        <if test="userIsAdmin==true">
            from permission_basic d
            where d.permission='edit'
            where
        </if>
            and d.state = 1
             d.state = 1
        group by  d.id
    </select>