设置密码

app/client/controllers/UserController.php

@@ -110,8 +110,8 @@ class UserController extends BaseController
 		if ($new != $confirm) {
 			util::fail('二次密码不一致');
 		}
-		$user = $this->user;
 		$userId = $this->userId;
+		$user = UserService::getUserInfo($userId, false);
 		if (isset($user['hasPayPwd']) && $user['hasPayPwd'] == 1) {
 			if (empty($old)) {
 				util::fail('请填写旧密码');

biz/user/classes/UserClass.php

@@ -82,10 +82,10 @@ class UserClass extends BaseClass
 	}
 	
 	//获取客户基本和资产信息 shish 2019.11.30
-	public static function getUserInfo($id)
+	public static function getUserInfo($id, $sensitive = true)
 	{
 		$list = self::getByIds([$id]);
-		$data = self::groupUserBaseInfo($list);
+		$data = self::groupUserBaseInfo($list, $sensitive);
 		return current($data);
 	}
 	

biz/user/services/UserService.php

@@ -36,9 +36,9 @@ class UserService extends BaseService
 	}
 	
 	//获取客户基本和资产信息 shish 2019.11.30
-	public static function getUserInfo($id)
+	public static function getUserInfo($id,$sensitive = true)
 	{
-		return UserClass::getUserInfo($id);
+		return UserClass::getUserInfo($id,$sensitive);
 	}
 	
 	//获取客户基本、资产和订单信息 shish 2019.11.30