Merge branch 'master' of https://git.orhontech.com/yaru/fgqyxxlr

e83d9398 · mouthliu · f7d3a405 · 9f2e2207 · e83d9398
Commit e83d9398 authored Sep 30, 2020 by mouthliu
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletions

ruoyi-system/src/main/resources/mapper/system/OrhonFgqyMapper.xml
+2 -1

No files found.
--- a/ruoyi-system/src/main/resources/mapper/system/OrhonFgqyMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/OrhonFgqyMapper.xml
@@ -462,7 +462,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        SELECT
            d.dict_label name,
            (select IFNULL(sum(IFNULL(dys,0)),0) from orhon_shzz where dept_id = d.dict_value) shzzDysValue,
-            (select IFNULL(sum(IFNULL(dys,0)),0) from orhon_fgqy where dept_id = d.dict_value) fgqyDysValue
+            (select IFNULL(sum(IFNULL(dys,0)),0) from orhon_fgqy where dept_id = d.dict_value) fgqyDysValue,
+            (select IFNULL(sum(IFNULL(dys,0)),0) from orhon_gtxx where dept_id = d.dict_value) gtshDysValue
        FROM
                sys_dict_data d
        WHERE