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