Merge remote-tracking branch 'origin/develop' into develop

2022-09-30 13:26:19 +08:00
parent fa85419f84 ff7e9905d9
commit 6787fc42fc
4 changed files with 67 additions and 0 deletions
@@ -979,6 +979,12 @@
                    if (data.list && data.list.length > 0) {
                        // 获取数值
                        let resultdata = data.list[0]['groupdata']
+                        let NYLXCLASS = resultdata['NYLXCLASS'] || {}
+                        let NYLX = resultdata['NYLX'] || {}
+                        if (Object.keys(NYLX).length > 0 && Object.keys(NYLXCLASS).length === 0) {
+                          NYLXCLASS = NYLX
+                        }
+                        resultdata['NYLXCLASS'] = NYLXCLASS
                        for (let i = 0; i < seniortype.length; i++) {
                            let nowdata = [{}]