修复group_sn和修改邮箱验重

normandcrm/admin/backend/modules/admin/controllers/IbController.php

@@ -327,7 +327,7 @@ class IbController extends BaseController
         $api = new MemberApi();
         $result = $api->updateMember($id, $data);
 
-        $result['message'] = $result['code'] == 1 ? '修改成功' : '修改失败';
+        $result['message'] = $result['code'] == 1 ? '修改成功' : $result['message'];
         return json_encode($result);
     }
 

normandcrm/service/backend/controllers/MemberController.php

@@ -166,7 +166,12 @@ class MemberController extends BaseController
         if ($member == null) {
             return $this->outJson(0, [], '用户不存在');
         }
-        $data = Yii::$app->getRequest()->post();       
+        $data = Yii::$app->getRequest()->post();
+
+        $username_num = Member::find()->select(['username'])->where(['username' => $data['username']])->andWhere(['!=', 'id', $data['id']])->limit(1)->asArray()->scalar();
+        if ($username_num) {
+            return $this->outJson(0, [], '电子邮箱已存在');
+        }		
         if(isset($data['password']) && trim($data['password']) != '') {
             $data['password'] = $member->hash($data['password']);
         } else {

normandcrm/service/backend/models/Member.php

@@ -59,7 +59,7 @@ class Member extends \yii\db\ActiveRecord
     {
         return [
             [['type', 'username', 'password'], 'required'],
-            [['type', 'is_enable', 'gender', 'random_code_time', 'ref_id', 'in_time'], 'integer'],
+            [['type', 'is_enable', 'gender', 'random_code_time', 'ref_id', 'in_time','group_sn'], 'integer'],
             [['birthday'], 'safe'],
             [['username', 'password', 'ip', 'logins', 'name', 'id_no', 'address', 'mobile', 'main_login', 'random_code', 'avatar', 'ib_old_login_name'], 'string', 'max' => 255],
             [['ref_path'], 'string', 'max' => 3000],
@@ -93,6 +93,7 @@ class Member extends \yii\db\ActiveRecord
             'ref_path' => 'Ref Path',
             'in_time' => 'In Time',
             'ib_old_login_name' => 'Ib Old Login Name',
+			'group_sn' =>'group sn'
         ];
     }