Merge branch 'dev_v1.0.3_wh' of moapp/jypkg into feature/v1.0.3

ent/entity/user.go

@@ -148,6 +148,7 @@ func (u *User) Add(tx *sql.Tx, entId int, user *User, paymentAddress, source, ns
 		"dept_id": user.Dept_id,
 		"user_id": user_id,
 	})
+
 	if user_id <= 0 || dept_user_id < 0 {
 		return user_id, false
 	}
@@ -186,11 +187,7 @@ func (u *User) Add(tx *sql.Tx, entId int, user *User, paymentAddress, source, ns
 		//base_user表，用户名字段 user_name
 		//mog库user表，用户名字段 user_name
 		if user.User_name != "" && len(user.User_name) > 0 {
-			/*Mysql.Update(Entniche_user, map[string]interface{}{
-				"phone": user.Phone,
-			}, map[string]interface{}{
-				"user_name": user.User_name,
-			})*/
+			Mysql.UpdateOrDeleteBySqlByTx(tx, `update entniche_user set user_name="?" where phone="?" and  ent_id!=?`, user.User_name, user.Phone, entId)
 			data, _ := MQFW.Find("user", map[string]interface{}{
 				"i_appid": 2,
 				"$or": []map[string]interface{}{
@@ -216,6 +213,7 @@ func (u *User) Add(tx *sql.Tx, entId int, user *User, paymentAddress, source, ns
 			}
 		}
 	}
+
 	return user_id, respData.Fool
 }
 
@@ -316,11 +314,11 @@ func (u *User) UpdateUserName(entId, userId int, user_name string) {
 	//mog库user表，用户名字段 user_name
 	if user_name != "" && len(user_name) > 0 {
 		user := u.GetById(entId, userId)
-		/*Mysql.Update(Entniche_user, map[string]interface{}{
+		Mysql.Update(Entniche_user, map[string]interface{}{
 			"phone": user.Phone,
 		}, map[string]interface{}{
 			"user_name": user_name,
-		})*/
+		})
 		data, _ := MQFW.Find("user", map[string]interface{}{
 			"i_appid": 2,
 			"$or": []map[string]interface{}{