优化线索、商机、项目相关开发

go/controllers/backend_crm_clue.go

@@ -86,7 +86,8 @@ func (c *BackendCrmClueController) List() {
 	total, _ := qs.Count()
 	var list []models.TenantCrmClue
 	if total > 0 {
-		_, _ = qs.OrderBy("-id").Offset((page - 1) * pageSize).Limit(pageSize).All(&list)
+		// 未转化的排前面，已转化的（locked=1）沉到列表下方
+		_, _ = qs.OrderBy("locked", "-id").Offset((page - 1) * pageSize).Limit(pageSize).All(&list)
 	}
 	pipelineOk(&c.Controller, map[string]interface{}{
 		"list": list, "total": total, "page": page, "pageSize": pageSize,
@@ -145,7 +146,7 @@ func (c *BackendCrmClueController) Create() {
 		ownerID = pipelineUID(claims)
 	}
 	if ownerName == "" {
-		ownerName = claims.Username
+		ownerName = resolveUserName(claims)
 	}
 	level := strings.TrimSpace(p.ClueLevel)
 	if level == "" {
@@ -271,6 +272,10 @@ func (c *BackendCrmClueController) Delete() {
 		pipelineErr(&c.Controller, 404, 404, "线索未找到")
 		return
 	}
+	if clue.Locked == 1 || clue.Status == 2 {
+		pipelineErr(&c.Controller, 400, 400, "线索已转化并锁定，不能删除")
+		return
+	}
 	if !canDeleteCrmRecord(claims, clue.CreateUserID) {
 		pipelineErr(&c.Controller, 403, 403, "只有创建人、租户管理员或平台管理员可以删除该线索")
 		return