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

PythonProject/api/student_api.py

@@ -46,8 +46,6 @@ def update_students(stu_id:int
     if not d:
         raise HTTPException(status_code=400, detail='更新内容不能为空')
     r = update_student_dao( stu_id=stu_id,update_data=d,db=db )
-    if r == 'conflict':
-        raise HTTPException(status_code=409, detail = '身份证号已被其他学生占用')
     if r == 'error':
         raise HTTPException(status_code=500, detail='更新失败，请稍后重试')
     if not r:

PythonProject/dao/student_dao.py

@@ -38,15 +38,6 @@ def delete_student_dao(stu_id, db):
 def update_student_dao(stu_id, update_data, db):
     if not update_data:
         return 0
-    id_card = update_data.get('id_card')
-    if id_card:
-        conflict = (db.query(Student_Model)
-                    .filter(Student_Model.id_card == id_card,
-                            Student_Model.stu_id != stu_id,
-                            Student_Model.delete_status == 0)
-                    .first())
-        if conflict:
-            return 'conflict'
     try:
         rows = (db.query(Student_Model)
                 .filter(Student_Model.stu_id == stu_id,
@@ -59,7 +50,6 @@ def update_student_dao(stu_id, update_data, db):
     except Exception:
         db.rollback()
         return 'error'
-
     return rows
 
 def get_student_dao(stu_id:Optional[int]