safecheck-client 4.0.0-61 → 4.0.0-63

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "safecheck-client",
   "//": "主分支版本别乱升，测试包的版本直接发包(建议使用1.XX.XX-XXX格式作为测试包，不要频繁升级第三位版本号)，别提交版本号。切了分支切记把主分支版本升了，保证主分支始终是最高版本！！！！！",
-  "version": "4.0.0-61",
+  "version": "4.0.0-63",
   "description": "安检模块 前端组件",
   "author": "丁新 <417755458@qq.com>",
   "license": "ISC",

package/src/filiale/meihekou/android/SafecheckOrderV.vue

@@ -1369,8 +1369,8 @@ export default {
               http.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
                 data: {
                   items: 'count(0) as num',
-                  tablename: 't_userfiles',
-                  condition: `f_userinfo_id = '${this.data.f_userinfoid}' and f_meter_classify != '物联网表'`,
+                  tablename: 't_userfiles a left join t_userinfo b on a.f_userinfo_id = b.f_userinfo_id',
+                  condition: `a.f_userinfo_id = '${this.item.f_userinfoid}' and a.f_meter_classify != '物联网表' and a.f_table_state = '正常' and b.f_user_state='正常'`,
                   orderitem: '1'
                 }
               }, {resolveMsg: null, rejectMsg: null}).then((response) => {
@@ -2072,8 +2072,8 @@ export default {
       let response = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/af-telephone/rs/sql/tel_singleTable_OrderBy`, {
         data: {
           items: 'count(0) as num',
-          tablename: 't_userfiles',
-          condition: `f_userinfo_id = '${this.item.f_userinfoid}' and f_meter_classify != '物联网表'`,
+          tablename: 't_userfiles a left join t_userinfo b on a.f_userinfo_id = b.f_userinfo_id',
+          condition: `a.f_userinfo_id = '${this.item.f_userinfoid}' and a.f_meter_classify != '物联网表' and a.f_table_state = '正常' and b.f_user_state='正常'`,
           orderitem: '1'
         }
       }, {resolveMsg: null, rejectMsg: null})