merge

app/entity/book_info.go

@@ -23,8 +23,7 @@ type BookInfo struct {
 	AutoLinkBreakAt   time.Time `gorm:"column:auto_link_break_at"`                 // 链接违约自动处理时间
 	AutoSketchBreakAt time.Time `gorm:"column:auto_sketch_break_at"`               // 初稿违约自动处理时间
 	BOperator         string    `gorm:"column:b_operator"`                         // 商家确定达人操作人ID
-
-	BOperatorType int `gorm:"column:b_operator_type;default:0"` // 商家操作人类型，1商家用户，2商家子账号，3管理后台
+	BOperatorType     int       `gorm:"column:b_operator_type;default:0"`          // 商家操作人类型，1商家用户，2商家子账号，3管理后台
 }
 
 func (m *BookInfo) TableName() string {

service/login_auth.go

@@ -164,12 +164,12 @@ func (l *loginAuth) AuthCode(ctx context.Context, phone string, code string) (st
 			Token:                token,
 			Role:                 userData.Role,
 			SubAccountId:         0,
-			JobName:              "-1",
+			JobName:              "主账号无岗位",
 			EnterpriseId:         enterpriseUser.EnterpriseID,
-			WorkshopPermission:   "-1",
-			CooperatePermission:  "-1",
-			FinancialPermission:  "-1",
-			TaskcenterPermission: "-1",
+			WorkshopPermission:   "1",
+			CooperatePermission:  "1",
+			FinancialPermission:  "1",
+			TaskcenterPermission: "1",
 		}
 	} else if ifSubAccount == 1 {
 		loginUserData = http_model.CodeLoginData{