From 796bafb2cac3676f842aa19f7b7971e4c353bf53 Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Mon, 19 Apr 2021 11:43:31 +0800
Subject: [PATCH]  * Fix execution team info error.

---
 module/execution/control.php        |  1 +
 module/execution/js/team.js         |  4 ++++
 module/execution/view/team.html.php | 11 ++++++++++-
 module/user/control.php             |  2 +-
 module/user/lang/de.php             |  3 ++-
 module/user/lang/en.php             |  1 +
 module/user/lang/fr.php             |  3 ++-
 module/user/lang/vi.php             |  3 ++-
 module/user/lang/zh-cn.php          |  1 +
 9 files changed, 24 insertions(+), 5 deletions(-)
 create mode 100644 module/execution/js/team.js

diff --git a/module/execution/control.php b/module/execution/control.php
index 2e1da26665..45b6407b93 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1177,6 +1177,7 @@ class execution extends control
 
         $this->view->title        = $title;
         $this->view->position     = $position;
+        $this->view->deptUsers    = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
         $this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
 
         $this->display();
diff --git a/module/execution/js/team.js b/module/execution/js/team.js
new file mode 100644
index 0000000000..d58ba42f6b
--- /dev/null
+++ b/module/execution/js/team.js
@@ -0,0 +1,4 @@
+function checkUserDept(userID)
+{
+    alert(noAccess);
+}
diff --git a/module/execution/view/team.html.php b/module/execution/view/team.html.php
index 64c9f952c0..642471af10 100644
--- a/module/execution/view/team.html.php
+++ b/module/execution/view/team.html.php
@@ -12,6 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php js::set('confirmUnlinkMember', $lang->execution->confirmUnlinkMember)?>
+<?php js::set('noAccess', $lang->user->error->noAccess)?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->execution->team;?></span></span>
@@ -66,7 +67,15 @@
         <tr>
           <td>
           <?php
-          if(!common::printLink('user', 'view', "userID={$member->userID}", $member->realname)) print $member->realname;
+          if(common::hasPriv('user', 'view'))
+          {
+              $link = isset($deptUsers[$member->userID]) ? $this->createLink('user', 'view', "userID={$member->userID}") : "javascript:checkUserDept();";
+              echo html::a($link, $member->realname, '', 'data-app="system"');
+          }
+          else
+          {
+              echo $member->realname;
+          }
           $memberHours = $member->days * $member->hours;
           $totalHours  += $memberHours;
           ?>
diff --git a/module/user/control.php b/module/user/control.php
index 9c7094011b..b01fafe60d 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -80,7 +80,7 @@ class user extends control
         $todos   = $this->todo->getList($type, $account, $status, 0, $pager, $sort);
         $date    = (int)$type == 0 ? helper::today() : $type;
         $users   = $this->loadModel('dept')->getDeptUserPairs($this->app->user->dept, 'useid');
-        if(!isset($users[$userID])) die(js::error($this->lang->notFound) . js::locate('back'));
+        if(!isset($users[$userID])) die(js::error($this->lang->user->error->noAccess) . js::locate('back'));
 
         /* set menus. */
         $this->view->userList = $this->user->setUserList($users, $userID);
diff --git a/module/user/lang/de.php b/module/user/lang/de.php
index 61208b67fd..2cd5990625 100644
--- a/module/user/lang/de.php
+++ b/module/user/lang/de.php
@@ -204,6 +204,7 @@ $lang->user->error->dangerPassword = "ID %s，Passwords cannot be used with [%s]
 
 $lang->user->error->verifyPassword   = "Verifikation fehlgeschlagen. Bitte geben Sie ihr Loginpasswort ein.";
 $lang->user->error->originalPassword = "Altes Passwort ist falsch.";
+$lang->user->error->noAccess         = "This user is not from your department. You have no access to this user information."
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -242,4 +243,4 @@ $lang->user->noticeResetFile = "<h5>Kontaktieren Sie den Administrator um Ihr Pa
     </ol>";
 $lang->user->notice4Safe = "Warning: Weak password of one click package detected";
 $lang->user->process4DIR = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
-$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
\ No newline at end of file
+$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
diff --git a/module/user/lang/en.php b/module/user/lang/en.php
index fb163ee378..013880de38 100644
--- a/module/user/lang/en.php
+++ b/module/user/lang/en.php
@@ -207,6 +207,7 @@ $lang->user->error->dangerPassword = "ID %s，Passwords cannot be used with [%s]
 $lang->user->error->verifyPassword   = "Verification failed. Please enter your Login Password.";
 $lang->user->error->originalPassword = "Old password is incorrect.";
 $lang->user->error->companyEmpty     = "Company name must be not empty.";
+$lang->user->error->noAccess         = "This user is not from your department. You have no access to this user information."
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
diff --git a/module/user/lang/fr.php b/module/user/lang/fr.php
index d00fa4eb48..819fe3c05f 100644
--- a/module/user/lang/fr.php
+++ b/module/user/lang/fr.php
@@ -204,6 +204,7 @@ $lang->user->error->dangerPassword = "ID %s，Les mots de passe ne peuvent pas u
 
 $lang->user->error->verifyPassword   = "Vérification en échec. Entrez votre Mot de Passe de Connexion.";
 $lang->user->error->originalPassword = "Ancien Mot de Passe incorrect.";
+$lang->user->error->noAccess         = "This user is not from your department. You have no access to this user information."
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -242,4 +243,4 @@ $lang->user->noticeResetFile = "<h5>Contactez l'administrateur pour réinitialis
     </ol>";
 $lang->user->notice4Safe = "Warning: Weak password of one click package detected";
 $lang->user->process4DIR = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
-$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
\ No newline at end of file
+$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
diff --git a/module/user/lang/vi.php b/module/user/lang/vi.php
index b89775236c..dffd57721b 100644
--- a/module/user/lang/vi.php
+++ b/module/user/lang/vi.php
@@ -204,6 +204,7 @@ $lang->user->error->dangerPassword = "ID %s，Mật khẩu không thể được
 
 $lang->user->error->verifyPassword   = "Xác thực thất bại. Vui lòng nhập mạt khẩu đăng nhập của bạn.";
 $lang->user->error->originalPassword = "Old password is incorrect.";
+$lang->user->error->noAccess         = "This user is not from your department. You have no access to this user information."
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;
@@ -242,4 +243,4 @@ $lang->user->noticeResetFile = "<h5>Liên hệ quản trị viên để thiết
  </ol>";
 $lang->user->notice4Safe = "Warning: Weak password of one click package detected";
 $lang->user->process4DIR = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Delete or rename the %s directory. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
-$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
\ No newline at end of file
+$lang->user->process4DB  = "It is detected that you may be using the one click installation package environment. Other sites in the environment are still using simple passwords. For security reasons, if you do not use other sites, please handle them in time. Please login database and modify password field of zt_user table of %s database. Visit: <a href='https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html' target='_blank'>https://www.zentao.pm/book/zentaomanual/fix-weak-password-564.html</a>";
diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php
index bdee7ced8f..a43467e8f2 100644
--- a/module/user/lang/zh-cn.php
+++ b/module/user/lang/zh-cn.php
@@ -207,6 +207,7 @@ $lang->user->error->dangerPassword = "【ID %s】的密码不能使用【%s】
 $lang->user->error->verifyPassword   = "验证失败，请检查您的系统登录密码是否正确";
 $lang->user->error->originalPassword = "原密码不正确";
 $lang->user->error->companyEmpty     = "公司名称不能为空！";
+$lang->user->error->noAccess         = "该人员和你不是同一部门，你无权访问该人员的工作信息。";
 
 $lang->user->contactFieldList['phone']    = $lang->user->phone;
 $lang->user->contactFieldList['mobile']   = $lang->user->mobile;