'commit'

dsBaseRpc/DataExchange/DataExchange.go

@@ -40,7 +40,7 @@ var IncrSqlDict = []tableStruct{
 	{TableName: "t_base_class", PrimaryKey: "class_id", DataSource: "org_class"},
 	{TableName: "t_base_teacher", PrimaryKey: "teacher_id", DataSource: "user_teacher"},
 	{TableName: "t_base_student", PrimaryKey: "student_id", DataSource: "user_student"},
-	{TableName: "t_sys_loginperson_log", PrimaryKey: "id", DataSource: "log_login"},
+	{TableName: "t_sys_loginperson_log", PrimaryKey: "id_int", DataSource: "log_login"},
 }
 
 // 全量数据上报

dsBaseRpc/Sql/t_sys_loginperson_log.sql

@@ -1,4 +1,4 @@
-select t1.id,identity_id,t1.person_id,t1.login_name,t1.ip_address,
+select t1.id_int,identity_id,t1.person_id,t1.login_name,t1.ip_address,
 DATE_FORMAT(t1.`login_time`,'%Y/%m/%d %H:%i:%s') AS `login_time`,
 t1.province_code,
 t1.city_code,t1.district_code,t1.bureau_id,

dsSso/models/t_sys_loginperson_log.go

@@ -5,7 +5,7 @@ import (
 )
 
 type TSysLoginpersonLog struct {
-	Id           int32     `xorm:"not null pk autoincr INT(11)"`
+	IdInt        int32     `xorm:"not null pk autoincr INT(11)"`
 	IdentityId   int32     `xorm:"not null comment('人员身份') INT(11)"`
 	PersonId     string    `xorm:"not null comment('人员ID') CHAR(36)"`
 	LoginName    string    `xorm:"not null comment('登录名') VARCHAR(255)"`