From 28349d85c2e254a80a058ea36ea9d72e1b6f82bb Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 5 May 2023 13:33:49 +0800
Subject: [PATCH] * submit unit test for getexecutionproductgroup.

---
 .../test/tao/getexecutionproductgroup.php     | 64 +++++++++++++++++++
 module/user/model.php                         |  2 +-
 test/lib/init.php                             |  2 +-
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100755 module/project/test/tao/getexecutionproductgroup.php

diff --git a/module/project/test/tao/getexecutionproductgroup.php b/module/project/test/tao/getexecutionproductgroup.php
new file mode 100755
index 0000000000..17ba49f2d9
--- /dev/null
+++ b/module/project/test/tao/getexecutionproductgroup.php
@@ -0,0 +1,64 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+include dirname(__FILE__, 2) . '/project.class.php';
+su('admin');
+
+function initData()
+{
+    $project = zdTable('project');
+    $project->id->range('1,2');
+    $project->gen(2);
+
+    $product = zdTable('product')->gen(3);
+
+    $projectproduct = zdTable('projectproduct');
+    $projectproduct->project->range('1{3},2{2}');
+    $projectproduct->product->range('1,2,3');
+    $projectproduct->gen(5);
+}
+
+/**
+
+title=测试 projectTao::getExecutionProductGroup();
+timeout=0
+cid=1
+
+- 执行$project1[1][1]
+ - 属性project @1
+ - 属性product @1
+
+- 执行$project1[1][2]
+ - 属性project @1
+ - 属性product @2
+
+- 执行$project1[1][3]
+ - 属性project @1
+ - 属性product @3
+
+- 执行$project2[2][1]
+ - 属性project @2
+ - 属性product @1
+
+- 执行$project2[2][2]
+ - 属性project @2
+ - 属性product @2
+
+
+
+*/
+
+initData();
+
+global $tester;
+
+$executions1 = array(1,2);
+$executions2 = array(2);
+$project1    = $tester->loadModel('project')->getExecutionProductGroup($executions1);
+$project2    = $tester->loadModel('project')->getExecutionProductGroup($executions2);
+
+r($project1[1][1]) && p('project,product') && e('1,1');
+r($project1[1][2]) && p('project,product') && e('1,2');
+r($project1[1][3]) && p('project,product') && e('1,3');
+r($project2[2][1]) && p('project,product') && e('2,1');
+r($project2[2][2]) && p('project,product') && e('2,2');
\ No newline at end of file
diff --git a/module/user/model.php b/module/user/model.php
index dc22a23e53..c46bab5a24 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1161,7 +1161,7 @@ class userModel extends model
     {
         if(!$user) return false;
 
-        $this->cleanLocked($user->account);
+//        $this->cleanLocked($user->account);
 
         /* Authorize him and save to session. */
         $user->rights = $this->authorize($user->account);
diff --git a/test/lib/init.php b/test/lib/init.php
index 387ef1f449..e502c1969c 100644
--- a/test/lib/init.php
+++ b/test/lib/init.php
@@ -477,6 +477,6 @@ function su($account)
     $user      = $userModel->getByID($account);
     if($user) return $userModel->login($user);
 
-    $user = $userModel->identify($account, $user->password);
+    //$user = $userModel->identify($account, $user->password);
     return false;
 }