Merge branch 'crm/8.8' into debug

controllers/approval_new.go

@@ -13,6 +13,7 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/contract_approval"
 	"hongze/hongze_mobile_admin/models/tables/contract_approval_record"
 	company_apply "hongze/hongze_mobile_admin/services/company_approval"
+	contractService "hongze/hongze_mobile_admin/services/contract"
 	"hongze/hongze_mobile_admin/utils"
 	"strconv"
 	"strings"
@@ -316,35 +317,41 @@ func (c *ApprovalCommon) Detail() {
 			return
 		}
 		// 权益主客观均选择的情况下进行合并
-		equityPermissionNameCount := make(map[string]int, 0)
+		//equityPermissionNameCount := make(map[string]int, 0)
 		for _, n := range items {
 			if _, ok := delayPermissionIdMap[n.ChartPermissionId]; ok {
 				checkList = append(checkList, n.ChartPermissionId)
 			}
-			equityPermissionNameCount[n.PermissionName] += 1
+			//equityPermissionNameCount[n.PermissionName] += 1
 		}
 
-		newItems := make([]*company_report_permission.PermissionLookItem, 0)
-		mergedMap := make(map[string]bool, 0)
-		for _, n := range items {
-			if equityPermissionNameCount[n.PermissionName] == 2 && !mergedMap[n.PermissionName] {
-				newItems = append(newItems, n)
-				mergedMap[n.PermissionName] = true
-			}
-			if equityPermissionNameCount[n.PermissionName] == 1 {
-				n.PermissionName = n.Remark
-				newItems = append(newItems, n)
-			}
-		}
-
-		plist.Items = newItems
+		//newItems := make([]*company_report_permission.PermissionLookItem, 0)
+		//mergedMap := make(map[string]bool, 0)
+		//for _, n := range items {
+		//	if equityPermissionNameCount[n.PermissionName] == 2 && !mergedMap[n.PermissionName] {
+		//		newItems = append(newItems, n)
+		//		mergedMap[n.PermissionName] = true
+		//	}
+		//	if equityPermissionNameCount[n.PermissionName] == 1 {
+		//		n.PermissionName = n.Remark
+		//		newItems = append(newItems, n)
+		//	}
+		//}
+
+		//plist.Items = newItems
+		plist.Items = items
 		plist.ClassifyName = v
 		plist.CheckList = checkList
 
 		if item.ProductId == 1 {
 			resp.FiccPermissionList = append(resp.FiccPermissionList, plist)
 		} else {
-			resp.PermissionList = append(resp.PermissionList, plist)
+			// CRM8.8-权限主客观合并
+			rp := make([]*company_report_permission.PermissionLookList, 0)
+			rp = append(rp, plist)
+			newPermissionLookList := contractService.HandleEquityPermissionLookList(rp)
+			//resp.PermissionList = append(resp.PermissionList, plist)
+			resp.PermissionList = newPermissionLookList
 		}
 
 	}