Merge branch 'test' of http://gitlab.fjmaimaimai.com/allied-creation/performance into test

@@ -327,6 +327,7 @@ func (srv StaffAssessServeice) QueryMemberPerformanceIndicator(in *query.MemberP
 
 
 	adapterList := make([]*adapter.PerformanceIndicatorAdapter, 0)
 	adapterList := make([]*adapter.PerformanceIndicatorAdapter, 0)
 	categoryMap := map[string]int{}     // 内容分类
 	categoryMap := map[string]int{}     // 内容分类
+	categoryNameMap := map[string]int{} // 内容名称
 	for i := range userIds {
 	for i := range userIds {
 		userId := userIds[i]
 		userId := userIds[i]
 		userIdInt, err := strconv.Atoi(userId)
 		userIdInt, err := strconv.Atoi(userId)
@@ -365,6 +366,9 @@ func (srv StaffAssessServeice) QueryMemberPerformanceIndicator(in *query.MemberP
 
 
 				// 内容名称有值合并到数组
 				// 内容名称有值合并到数组
 				if len(item.Name) > 0 {
 				if len(item.Name) > 0 {
+					onlyKey2 := userId + item.Category + item.Name
+					if _, ok := categoryNameMap[onlyKey2]; !ok {
+						categoryNameMap[onlyKey2] = 0
 						for index := range pia.PIContents {
 						for index := range pia.PIContents {
 							piContent := &pia.PIContents[index]
 							piContent := &pia.PIContents[index]
 							if piContent.Category == item.Category {
 							if piContent.Category == item.Category {
@@ -376,6 +380,7 @@ func (srv StaffAssessServeice) QueryMemberPerformanceIndicator(in *query.MemberP
 				}
 				}
 			}
 			}
 		}
 		}
+	}
 
 
 	/*
 	/*
 		// 旧版（如果未填写自评会出现数据评估项丢失的BUG）
 		// 旧版（如果未填写自评会出现数据评估项丢失的BUG）

@@ -249,7 +249,6 @@ func (c *StaffAssessController) QueryMemberPerformanceIndicator() {
 		if user := middlewares.GetUser(c.Ctx); user != nil {
 		if user := middlewares.GetUser(c.Ctx); user != nil {
 			in.CompanyId = int(user.CompanyId)
 			in.CompanyId = int(user.CompanyId)
 			in.OperatorId = int(user.UserId)
 			in.OperatorId = int(user.UserId)
-
 		}
 		}
 		c.Response(srv.QueryMemberPerformanceIndicator(in))
 		c.Response(srv.QueryMemberPerformanceIndicator(in))
 	}
 	}