From 5f7d1c843477b369a840ded8b75c923e5cbc1ef5 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Sun, 26 Sep 2021 14:49:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tduck/cloud/project/mapper/PrUserProjectResultExtDao.java  | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tduck-project/src/main/java/com/tduck/cloud/project/mapper/PrUserProjectResultExtDao.java b/tduck-project/src/main/java/com/tduck/cloud/project/mapper/PrUserProjectResultExtDao.java
index c2d69e6..b820de5 100644
--- a/tduck-project/src/main/java/com/tduck/cloud/project/mapper/PrUserProjectResultExtDao.java
+++ b/tduck-project/src/main/java/com/tduck/cloud/project/mapper/PrUserProjectResultExtDao.java
@@ -40,8 +40,7 @@ public interface PrUserProjectResultExtDao extends BaseMapper<PrUserProjectResul
      */
     @Select("SELECT id, customer_id, project_key, user_project_result, client_type, user_id, real_name, org_id, org_name, org_type " +
             "FROM pr_user_project_result_ext " +
-            "WHERE project_key=#{projectKey} " +
-            "GROUP BY user_id ")
+            "WHERE project_key=#{projectKey} ")
     List<PrUserProjectResultExtDTO> selectResultExtList(String projectKey);
 	
 }
\ No newline at end of file

From 3be0ca5ecbebdbff512895f7231767d2f1d3ea2b Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Sun, 26 Sep 2021 14:53:36 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=E3=80=90?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=E9=97=AE=E5=8D=B7=E8=AF=A6=E6=83=85=E3=80=91?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89accessKey=E7=9A=84=E6=A3=80=E9=AA=8C=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E9=A2=84=E8=A7=88=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=B9=9F=E8=A6=81=E7=94=A8=E5=88=B0=E8=BF=99=E4=B8=AA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E3=80=82=E5=8F=AA=E6=98=AF=E5=9C=A8=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E8=B0=83=E6=9F=A5=E9=97=AE=E5=8D=B7=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E5=81=9A=E8=BF=99=E4=B8=AA=E6=A3=80=E9=AA=8C=EF=BC=8C/user/pro?=
 =?UTF-8?q?ject/result/create?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/web/controller/UserProjectController.java    | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
index 8893a27..31caac9 100644
--- a/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
+++ b/tduck-api/src/main/java/com/tduck/cloud/api/web/controller/UserProjectController.java
@@ -253,14 +253,12 @@ public class UserProjectController {
      * @param key
      */
     @GetMapping("/user/project/details/{key}")
-    public Result queryProjectDetails(@PathVariable @NotBlank String key,
-                                      @RequestParam(value = "access_key", required = true) String accessKey,
-                                      @RequestHeader(value = "userId", required = true) String userId) {
+    public Result queryProjectDetails(@PathVariable @NotBlank String key) {
         // 先校验有没有访问该问卷的权限
-        String accessKeyFromCache = (String) redisUtils.get(String.format("epmet:questionnaire:accesskey:%s:%s", userId, key));
-        if (StringUtils.isBlank(accessKeyFromCache) || !accessKeyFromCache.equals(accessKey)) {
-            throw new RuntimeException("您没有访问权限");
-        }
+        //String accessKeyFromCache = (String) redisUtils.get(String.format("epmet:questionnaire:accesskey:%s:%s", userId, key));
+        //if (StringUtils.isBlank(accessKeyFromCache) || !accessKeyFromCache.equals(accessKey)) {
+        //    throw new RuntimeException("您没有访问权限");
+        //}
 
         UserProjectEntity project = projectService.getByKey(key);
         List<UserProjectItemEntity> projectItemList = projectItemService.listByProjectKey(key);