fix type_id_to_u64

card.cpp

@@ -376,8 +376,7 @@ void card_list::load_his_card_postion_staff()
 
 void card_list::on_message(zloop<task*> *loop,const message_locinfo&loc,bool is_history)
 {
-	//std::shared_ptr<card_location_base>c=get(loc.m_card_id);
-	uint64_t cardid = tool_other::type_id_to_u64(loc.m_card_id,loc.m_card_type);
+	uint64_t cardid = tool_other::type_id_to_u64(loc.m_card_type,loc.m_card_id);
 	const auto c=card_list::instance()->get(cardid);
 	if(c==nullptr)
 	{

db/db_card.cpp

@@ -130,7 +130,7 @@ namespace db_card
 
 	std::unordered_map<uint64_t,std::shared_ptr<card_location_base>> load_person(int64_t id64,const std::string&strategy)
 	{
-		std::string sql = "SELECT staff_id, s.card_id, c.card_type_id, s.dept_id, s.group_id, s.occupation_id, \
+		std::string sql = "SELECT s.staff_id, s.card_id, c.card_type_id, s.dept_id, s.group_id, s.occupation_id, \
 						   ol.occupation_level_id,s.worktype_id,s.need_display,s.work_line\
 							,ds.name as staffer_name,dd.name as dept_name\
 						   FROM dat_staff_extend s \