Merge remote-tracking branch 'origin/develop' into develop

db/auto_task.go

@@ -146,7 +146,7 @@ func AutoCompleteSelection() error {
 	return nil
 }
 
-// GetAutoDraftDefaultTask 品牌种草-商品寄拍 初稿超时违约
+// GetAutoDraftDefaultTask 初稿违约一
 func GetAutoDraftDefaultTask() error {
 	fmt.Println("GetAutoDraftDefaultInPicTask Running")
 	db := GetReadDB(context.Background())
@@ -395,7 +395,7 @@ func GetAutoDraftDefaultTask() error {
 	return nil
 }
 
-// GetAutoLinkDefaultTask 品牌种草 链接超时违约
+// GetAutoLinkDefaultTask 链接质检违约
 func GetAutoLinkDefaultTask() error {
 
 	// 1. 筛选出可能链接超时违约的子任务，首次/修改
@@ -635,7 +635,7 @@ func GetAutoLinkDefaultTask() error {
 	return nil
 }
 
-// GetAutoCaseCloseDefaultTask 品牌种草 数据超时违约
+// GetAutoCaseCloseDefaultTask 数据质检违约
 func GetAutoCaseCloseDefaultTask() error {
 
 	// 1. 筛选出可能数据违约的种草子任务 待上传/待修改

db/sectask.go

@@ -104,7 +104,7 @@ func GetSecTaskList(ctx context.Context, selectionId string, taskStatus int, sea
 		}
 	} else {
 		// 默认排序
-		db = db.Order("sec_task_id desc")
+		db = db.Order("task_id desc")
 	}
 
 	// 查询总数

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{