Merge branch 'master' of http://192.168.3.207:8080/ApplicationCenter/medicalField

service/AuthService.go

@@ -58,13 +58,13 @@ func (b AuthService) UserAuthInfoSave(in *medical.UserInfo) (bool, string) {
 			"mail":        in.Mail,
 			"ent_name":    in.EntName,
 			"user_id":     in.UserId,
-			"create_time": time.Now().Local(),
+			"create_time": time.Now(),
 			"appid":       in.Appid,
 			"source":      entity.MEDICALDOMAIN,
 		}
 		msg := ""
 		ok := entity.BaseMysql.ExecTx("认证信息保存", func(tx *sql.Tx) bool {
-			ok1 := entity.BaseMysql.InsertBySqlByTx(tx, entity.DOMAIN_CAPITAL_RETENTION, data)
+			ok1 := entity.BaseMysql.InsertByTx(tx, entity.DOMAIN_CAPITAL_RETENTION, data)
 			if ok1 <= 0 {
 				log.Println(fmt.Sprintf("认证失败:参数:%v", data))
 				msg = "认证信息保存失败"

service/portrait_test.go

@@ -143,7 +143,7 @@ func TestPortraitService_List(t *testing.T) {
 			this := &PortraitService{
 				Conn: tt.fields.Conn,
 			}
-			got, _, err := this.List(tt.args.companyId, tt.args.pagesize, tt.args.pagenum)
+			got, _, err := this.List(tt.args.companyId, tt.args.pagesize, tt.args.pagenum, false)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("Info() error = %v, wantErr %v", err, tt.wantErr)
 				return