Merge remote-tracking branch 'origin/Django' into Django

# Conflicts:
#	main/templates/main/home.html

elastic/es_connect.py

@@ -232,7 +232,7 @@ def update_by_id(doc_id, updated_data):
     try:
         # 获取文档
         achievement = AchievementDocument.get(id=doc_id)
-        
+        print(doc_id)
         # 更新字段
         if 'writer_id' in updated_data:
             achievement.writer_id = updated_data['writer_id']
@@ -391,6 +391,26 @@ def write_user_data(user_data):
         print(f"用户数据写入失败: {str(e)}")
         return False
 
+def get_user_by_id(user_id):
+    try:
+        search = UserDocument.search()
+        search = search.query("term", user_id=user_id)
+        response = search.execute()
+
+        if response.hits:
+            hit = response.hits[0]
+            return {
+            "user_id": hit.user_id,
+            "username": hit.username,
+            "password": hit.password,
+            "permission": hit.permission
+        }
+        return None
+
+    except Exception as e:
+        print(f"获取用户数据失败: {str(e)}")
+        return None
+
 def get_user_by_username(username):
     """
     根据用户名获取用户数据