Merge remote-tracking branch 'origin/master'

controllers/company_permission.go

@@ -101,7 +101,7 @@ func (this *CompanyPermissionController) PermissionVariety() {
 		br.Ret = 408
 		return
 	}
-	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox {
+	if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
 		br.Ret = 200
 		br.Success = true
 		br.Msg = "获取成功"

controllers/data_manage/smm_api.go

@@ -7,6 +7,7 @@ import (
 	"eta/eta_api/utils"
 	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"strconv"
 	"strings"
 )
 
@@ -104,13 +105,20 @@ func (this *EdbInfoController) SmmApiList() {
 		}
 	}
 
+	sortStr := ``
+
 	if keyword != "" {
 		keyWordArr := strings.Split(keyword, " ")
 		if len(keyWordArr) > 0 {
 			condition += " AND ( "
-			for _, v := range keyWordArr {
+			keywordStr := strings.Replace(keyword, " ", "", -1)
+			condition += ` CONCAT(index_name,index_code) LIKE '%` + keywordStr + `%' OR `
+			sortStr += ` CASE WHEN CONCAT(index_name,index_code) LIKE '%` + keywordStr + `%' THEN 1 `
+			for i, v := range keyWordArr {
 				condition += ` CONCAT(index_name,index_code) LIKE '%` + v + `%' OR`
+				sortStr += ` WHEN CONCAT(index_name,index_code) LIKE '%` + v + `%' THEN  ` + strconv.Itoa(i+2) + ` `
 			}
+			sortStr += ` END, `
 			condition = strings.TrimRight(condition, "OR")
 			condition += " ) "
 		}
@@ -126,11 +134,10 @@ func (this *EdbInfoController) SmmApiList() {
 		condition += " AND index_code IN (" + indexCodeStr + ") "
 	}
 
-	sortStr := ``
 	if sortParam != `` {
-		sortStr = fmt.Sprintf("%s %s,modify_time desc ", utils.PascalToSnake(sortParam), sortType)
+		sortStr += fmt.Sprintf("%s %s,modify_time desc ", utils.PascalToSnake(sortParam), sortType)
 	} else {
-		sortStr = " modify_time desc "
+		sortStr += " modify_time desc "
 	}
 
 	total, err := data_manage.GetSmmIndexDataListCount(condition, pars)

models/db.go

@@ -64,7 +64,7 @@ func init() {
 	gl.SetConnMaxLifetime(10 * time.Minute)
 
 	// 用户主库
-	if utils.MYSQL_WEEKLY_URL != `` && (utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox) {
+	if utils.MYSQL_WEEKLY_URL != `` && (utils.BusinessCode == utils.BusinessCodeRelease || utils.BusinessCode == utils.BusinessCodeSandbox || utils.BusinessCode == utils.BusinessCodeDebug) {
 		_ = orm.RegisterDataBase("weekly", "mysql", utils.MYSQL_WEEKLY_URL)
 		orm.SetMaxIdleConns("weekly", 50)
 		orm.SetMaxOpenConns("weekly", 100)

models/sandbox/sandbox_classify.go

@@ -123,9 +123,9 @@ func GetSandboxInfoCountByClassifyId(classifyId int) (count int, err error) {
 					 (SELECT @pid := ?) pd 
 				WHERE FIND_IN_SET(parent_id, @pid) > 0 
 				  AND @pid := CONCAT(@pid, ',', sandbox_classify_id) 
-				UNION SELECT * FROM sandbox_classify WHERE sandbox_classify_id = @pid
+				UNION SELECT * FROM sandbox_classify WHERE sandbox_classify_id = @pid 
 				)AS t
-				) `
+				) AND a.is_delete = 0 `
 	err = o.Raw(sql, classifyId).QueryRow(&count)
 	return
 }

utils/constants.go

@@ -334,6 +334,7 @@ const BusinessCodeSalt = "dr7WY0OZgGR7upw1"
 const (
 	BusinessCodeSandbox = "E2023080700" // 试用平台
 	BusinessCodeRelease = "E2023080900" // 生产环境
+	BusinessCodeDebug   = "E2023080901" // 测试环境
 )
 
 // 验证码