app-ht

1. F 版本升级日志筛选条件字段填错

app-ht
1. F 版本升级日志筛选条件字段填错
xu
1 parent d5e57a77
Showing 3 changed files with 3 additions and 3 deletions Show diff stats
app-ht/modules/datas/controllers/UpgradeLogController.php
app-ht/modules/datas/views/upgrade-log/index.php
console/controllers/TestController.php
@@ -95,7 +95,7 @@ class UpgradeLogController extends BaseController
             $where[] = ['like', 'ul.error_code', $error_code];
         }
         if ($device_device_id) {
-            $where[] = ['like', 'de.device_id', $device_device_id];
+            $where[] = ['like', 'ul.device_id', $device_device_id];
         }
         if ($dataType) {
             $where[] = ['=', 'ul.type', $dataType];
@@ -54,7 +54,7 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
                     <td class="text-right">升级状态</td>
                     <td class="text-left">
                         <select class="form-control" style="width: 150px;" id="status" name="status">
-                            <option>全部</option>
+                            <option value="">全部</option>
                             <?php foreach (UpgradeLogStatus::statusLabels() as $key => $value) { ?>
                             <option value="<?=$key ?>" <?php if (isset($gets['status']) && $gets['status'] == $key){ echo "selected"; } ?>><?=$value ?></option>
                             <?php } ?>
@@ -248,7 +248,7 @@ class TestController extends Controller
     {
         $str = "87654321";
         $rsa = new RSACrypt();
-        $deStr = "dFz10grDo8eO/+APJvPG4B4suilGLsFcHyMc/JIVUhIUWpILFhJD6g2z1TVusvzSxXsQJpNO44fFxzy8F4j/u/l61HAxS3owpgcmJ4e5mU3ugXftBqazOYErYssnoh03khaJUalwwlw/N5NpspRT6GXVwegEQnJKnGsIwZqXbsY=";
+        $deStr = "i5fNIUnPIFuSWeSIfh6f2Ehrm101XQMKRKuJ86QdrswO90jzcTw6LxWZDDe9YaS6KEnnUP8QaKuFKNEZlY+UsLWxBSKLwPEt3Qf7TAV6bXQBIYBzOXZTFpjvaBa+v1nQFrBPhYBo\/2RF5uVhk8xEilIe7A2XQLEvvhowIjFJevE=";
  
         //echo $deStr."\r\n";
         echo $rsa->decrypt($deStr);
...	...	@@ -95,7 +95,7 @@ class UpgradeLogController extends BaseController
95	95	$where[] = ['like', 'ul.error_code', $error_code];
96	96	}
97	97	if ($device_device_id) {
98		- $where[] = ['like', 'de.device_id', $device_device_id];
	98	+ $where[] = ['like', 'ul.device_id', $device_device_id];
99	99	}
100	100	if ($dataType) {
101	101	$where[] = ['=', 'ul.type', $dataType];
...	...
...	...	@@ -54,7 +54,7 @@ $this->params['breadcrumbs'][] = $this->title;
54	54	<td class="text-right">升级状态</td>
55	55	<td class="text-left">
56	56	<select class="form-control" style="width: 150px;" id="status" name="status">
57		- <option>全部</option>
	57	+ <option value="">全部</option>
58	58	<?php foreach (UpgradeLogStatus::statusLabels() as $key => $value) { ?>
59	59	<option value="<?=$key ?>" <?php if (isset($gets['status']) && $gets['status'] == $key){ echo "selected"; } ?>><?=$value ?></option>
60	60	<?php } ?>
...	...
...	...	@@ -248,7 +248,7 @@ class TestController extends Controller
248	248	{
249	249	$str = "87654321";
250	250	$rsa = new RSACrypt();
251		- $deStr = "dFz10grDo8eO/+APJvPG4B4suilGLsFcHyMc/JIVUhIUWpILFhJD6g2z1TVusvzSxXsQJpNO44fFxzy8F4j/u/l61HAxS3owpgcmJ4e5mU3ugXftBqazOYErYssnoh03khaJUalwwlw/N5NpspRT6GXVwegEQnJKnGsIwZqXbsY=";
	251	+ $deStr = "i5fNIUnPIFuSWeSIfh6f2Ehrm101XQMKRKuJ86QdrswO90jzcTw6LxWZDDe9YaS6KEnnUP8QaKuFKNEZlY+UsLWxBSKLwPEt3Qf7TAV6bXQBIYBzOXZTFpjvaBa+v1nQFrBPhYBo\/2RF5uVhk8xEilIe7A2XQLEvvhowIjFJevE=";
252	252
253	253	//echo $deStr."\r\n";
254	254	echo $rsa->decrypt($deStr);
...	...