ok

common/db/db_user.py

@@ -18,7 +18,14 @@ def get_user_name_by_id(db: Session, user_id: int) -> str:
 
 def get_user_id_by_phonenumber(db: Session, phonenumber: str) -> int:
     # 手机号码已加密
-    row = db.query(SysUser).filter(SysUser.phonenumber == mpfun.enc_data(phonenumber)).first()
+    row = db.query(SysUser).filter(and_(SysUser.phonenumber == mpfun.enc_data(phonenumber), SysUser.del_flag == '0')).first()
+    if row is not None:
+        return row.user_id
+
+    return -1
+
+def get_user_id_by_yzyaccount(db: Session, yzyaccount: str) -> int:
+    row = db.query(SysUser).filter(and_(SysUser.yzy_account == yzyaccount, SysUser.del_flag == '0')).first()
     if row is not None:
         return row.user_id
 

routers/api/onlineRollCall/call.py

@@ -680,7 +680,7 @@ def send_yzy_msg(db: Session, detail_entity: OnlineRollCallDetail, user_id: int)
             YzyApi.add_to_msg_queue(db, data)
 
             # 匹配到sys_user的user_id
-            sys_user_userid = db_user.get_user_id_by_phonenumber(db, mpfun.enc_data(mobile))
+            sys_user_userid = db_user.get_user_id_by_yzyaccount(db, yzy_userid)
             db_msg_center.add_message(db, "在线点名", sys_user_userid, "在线点名提醒", "你有一条在线点名通知，请尽快确认", str(detail_entity.id), 'online_roll_call_detail')
 
             user_list.append(yzy_userid)