From 7aacb13fb2cc766e8714bce674cbdeef64dff4f3 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@chandao.com>
Date: Fri, 15 Aug 2025 02:05:41 +0000
Subject: [PATCH 1/2]  * [misc] fix block bug.

---
 module/block/model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/block/model.php b/module/block/model.php
index d3729851fa..4f54fa7d45 100644
--- a/module/block/model.php
+++ b/module/block/model.php
@@ -273,6 +273,7 @@ class blockModel extends model
             ->markRight(1)
             ->andWhere('vision')->eq($block->vision)
             ->andWhere('hidden')->eq('0')
+            ->andWhere('account')->eq($this->app->user->account)
             ->fetch('top');
 
         if(!$top) $top = 0;

From 10d971b0652d149fabbb7f2b3adf2cd07b629767 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@chandao.com>
Date: Fri, 15 Aug 2025 02:12:10 +0000
Subject: [PATCH 2/2]  * [unittest] modify unittest.

---
 module/block/test/model/computeblocktop.php | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/module/block/test/model/computeblocktop.php b/module/block/test/model/computeblocktop.php
index dd2c299859..da692f4820 100755
--- a/module/block/test/model/computeblocktop.php
+++ b/module/block/test/model/computeblocktop.php
@@ -25,6 +25,12 @@ title=测试 blockModel->getByID();
 timeout=0
 cid=1
 
+- 测试新加入的区块宽度为2的时候，top是否为6。 @6
+- 测试新加入的区块宽度为1的时候，top是否为15。 @15
+- 测试新加入的区块宽度为3的时候，top是否为3。 @3
+- width为0的时候，仍然是3 @3
+- width为100的时候，仍然是3 @3
+
 */
 
 global $tester;
@@ -44,3 +50,21 @@ $block->dashboard = 'my';
 $block->width     = '1';
 $block->vision    = 'rnd';
 r($tester->block->computeBlockTop($block)) && p('') && e('15'); // 测试新加入的区块宽度为1的时候，top是否为15。
+
+$block = new stdclass();
+$block->dashboard = 'my';
+$block->width     = '3';
+$block->vision    = 'rnd';
+r($tester->block->computeBlockTop($block)) && p('') && e('3'); // 测试新加入的区块宽度为3的时候，top是否为3。
+
+$block = new stdclass();
+$block->dashboard = 'my';
+$block->width     = '0';
+$block->vision    = 'rnd';
+r($tester->block->computeBlockTop($block)) && p('') && e('3'); // width为0的时候，仍然是3
+
+$block = new stdclass();
+$block->dashboard = 'my';
+$block->width     = '100';
+$block->vision    = 'rnd';
+r($tester->block->computeBlockTop($block)) && p('') && e('3'); // width为100的时候，仍然是3
\ No newline at end of file