提交

@@ -49,7 +49,7 @@ func init() {
 		),
 		),
 		beego.NSNamespace("/auth",
 		beego.NSNamespace("/auth",
 			beego.NSRouter("/change_company", &controllers.AuthController{}, "post:ChangeCompany"),
 			beego.NSRouter("/change_company", &controllers.AuthController{}, "post:ChangeCompany"),
-			beego.NSRouter("/refresh_token", &controllers.AuthController{}, "post:RefreshToken"),
+			//beego.NSRouter("/refresh_token", &controllers.AuthController{}, "post:RefreshToken"),
 			beego.NSRouter("/me", &controllers.AuthController{}, "post:Me"),
 			beego.NSRouter("/me", &controllers.AuthController{}, "post:Me"),
 		),
 		),
 		beego.NSNamespace("/bulletin",
 		beego.NSNamespace("/bulletin",

@@ -498,13 +498,12 @@ func UserDelete(userCompanyids []int64, companyid int64) error {
 			log.Error(e.Error())
 			log.Error(e.Error())
 		}
 		}
 	}
 	}
-
 	return nil
 	return nil
 }
 }
 
 
 func UserList(param protocol.RequestUserList) (protocol.ResponseUserList, error) {
 func UserList(param protocol.RequestUserList) (protocol.ResponseUserList, error) {
 
 
-	datasql := `SELECT a.id as user_company_id,a.enable, b.phone,b.nick_name
+	datasql := `SELECT a.id as user_company_id,a.enable, b.phone,a.nick_name
 				FROM user_company AS a
 				FROM user_company AS a
 				LEFT JOIN user AS b ON a.user_id = b.id
 				LEFT JOIN user AS b ON a.user_id = b.id
 				WHERE a.company_id=? AND a.delete_at = 0 `
 				WHERE a.company_id=? AND a.delete_at = 0 `