Merge branch 'master' into dev/2.1

controller/crm/contract.go

@@ -239,11 +239,12 @@ func (rg *ContractController) ServiceDetail(c *gin.Context) {
 		return
 	}
 
-	//chartPermissionMap, e := crmService.GetServicePermissionMap(contractDetail.Service)
-	//if e != nil {
-	//	resp.FailMsg("获取失败", "获取合同服务中的权限ID失败, Err: "+e.Error(), c)
-	//	return
-	//}
+	// 获取合同服务中的权限ID失败
+	_, e = crmService.GetServicePermissionMap(contractDetail.Service)
+	if e != nil {
+		resp.FailMsg("获取失败", "获取合同服务中的权限ID失败, Err: "+e.Error(), c)
+		return
+	}
 
 	resp.OkData("获取成功", contractDetail, c)
 }