密码

app-hd/controllers/AdminController.php

@@ -208,7 +208,7 @@ class AdminController extends BaseController
 	{
 		$get = Yii::$app->request->get();
 		$adminId = $this->adminId;
-		$info = AdminClass::getAdminById($adminId, false);
+		$info = AdminClass::getAdminById($adminId);
 		if (isset($info['payPassword']) && !empty($info['payPassword'])) {
 			util::fail('您已经设置了支付密码');
 		}

app-hd/controllers/BaseController.php

@@ -33,7 +33,7 @@ class BaseController extends PublicController
         if (empty($adminId)) {
             util::notLogin();
         }
-        $admin = AdminClass::getAdminById($adminId, true);
+        $admin = AdminClass::getAdminById($adminId);
         if (empty($admin)) {
             util::notLogin();
         }

biz-hd/admin/classes/AdminClass.php

@@ -71,20 +71,13 @@ class AdminClass extends BaseClass
     }
 
     //组合员工基本信息 $sensitive = true 表示敏感的，不要输出密码信息 ssh 2019.12.9
-    public static function groupAdminBaseInfo($list, $sensitive = true)
+    public static function groupAdminBaseInfo($list)
     {
         foreach ($list as $key => $val) {
             $list[$key]['roleName'] = '';
             $list[$key]['avatarUrl'] = imgUtil::groupImg($val['avatar']);
             $list[$key]['addDate'] = date("Y-m-d H:i", $val['addTime']);
             $list[$key]['lastLoginTime'] = date("Y-m-d H:i", $val['loginTime']);
-            //敏感信息
-            if ($sensitive) {
-                //这里需要输出值secret，否则修改密码那边会有问题
-                $list[$key]['openId'] = isset($val['openId']) && !empty($val['openId']) ? 'secret' : '';
-                $list[$key]['password'] = isset($val['password']) && !empty($val['password']) ? 'secret' : '';
-                $list[$key]['payPassword'] = isset($val['payPassword']) && !empty($val['payPassword']) ? 'secret' : '';
-            }
         }
         return $list;
     }
@@ -102,13 +95,13 @@ class AdminClass extends BaseClass
 
     //获取员工详情 ssh 2019.12.9
     // $sensitive = true 表示敏感的，不要输出密码等信息
-    public static function getAdminById($id, $sensitive = true)
+    public static function getAdminById($id)
     {
         $detail = AdminClass::getById($id);
         if (empty($detail)) {
             util::fail('没有找到员工信息！');
         }
-        $list = self::groupAdminBaseInfo([$detail], $sensitive);
+        $list = self::groupAdminBaseInfo([$detail]);
         return current($list);
     }