提交 f8f28515 authored 作者: taojinlong's avatar taojinlong

Merge branch 'dev' of github.com:dataease/dataease into dev

...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
and panel_group.level = #{level} and panel_group.level = #{level}
</if> </if>
</where> </where>
ORDER BY CONVERT(panel_group.name using gbk) ORDER BY panel_group.node_type desc, CONVERT(panel_group.name using gbk)
</select> </select>
<delete id="deleteCircle"> <delete id="deleteCircle">
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
`sys_auth`.`id` = `sys_auth_detail`.`auth_id` `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
))) )))
WHERE WHERE
sys_auth_detail.privilege_value = #{request.userId} sys_auth_detail.privilege_value = 1
AND sys_auth.auth_source_type = #{request.modelType} AND sys_auth.auth_source_type = #{request.modelType}
AND ( AND (
( (
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
) authInfo ON v_auth_model.id = authInfo.auth_source ) authInfo ON v_auth_model.id = authInfo.auth_source
WHERE WHERE
FIND_IN_SET( v_auth_model.id, cids ) FIND_IN_SET( v_auth_model.id, cids )
ORDER BY CONVERT(v_auth_model.label using gbk) asc ORDER BY v_auth_model.node_type desc, CONVERT(v_auth_model.label using gbk) asc
</select> </select>
</mapper> </mapper>
This source diff could not be displayed because it is too large. You can view the blob instead.
差异被折叠。
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论