Merge remote-tracking branch 'epmet/dev_epmet_mix' into dev_epmet_mix

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,
+    public Result queryProjectDetails(@PathVariable @NotBlank String key) {
-                                      @RequestParam(value = "access_key", required = true) String accessKey,
-                                      @RequestHeader(value = "userId", required = true) String userId) {
         // 先校验有没有访问该问卷的权限
-        String accessKeyFromCache = (String) redisUtils.get(String.format("epmet:questionnaire:accesskey:%s:%s", userId, key));
+        //String accessKeyFromCache = (String) redisUtils.get(String.format("epmet:questionnaire:accesskey:%s:%s", userId, key));
-        if (StringUtils.isBlank(accessKeyFromCache) || !accessKeyFromCache.equals(accessKey)) {
+        //if (StringUtils.isBlank(accessKeyFromCache) || !accessKeyFromCache.equals(accessKey)) {
-            throw new RuntimeException("您没有访问权限");
+        //    throw new RuntimeException("您没有访问权限");
-        }
+        //}
 
         UserProjectEntity project = projectService.getByKey(key);
         List<UserProjectItemEntity> projectItemList = projectItemService.listByProjectKey(key);

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} " +
+            "WHERE project_key=#{projectKey} ")
-            "GROUP BY user_id ")
     List<PrUserProjectResultExtDTO> selectResultExtList(String projectKey);
 	
 }