From 611ae17c16aefb3314a1322c325e1e008030d9e2 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 14 Oct 2021 14:17:28 +0800
Subject: [PATCH] =?UTF-8?q?20211014=E4=BF=AE=E6=94=B9=E5=8C=BB=E9=99=A2?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/carbasics/api/RoleController.java  | 54 +++++++++----------
 .../resources/mapper_dao/OrganizationDao.xml  |  3 ++
 2 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/main/java/com/ccsens/carbasics/api/RoleController.java b/src/main/java/com/ccsens/carbasics/api/RoleController.java
index 92f66c6..1b4532d 100644
--- a/src/main/java/com/ccsens/carbasics/api/RoleController.java
+++ b/src/main/java/com/ccsens/carbasics/api/RoleController.java
@@ -41,33 +41,33 @@ public class RoleController {
     @RequestMapping(value = "/show", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
         public JsonResponse<CRoleVo.QueryRole> queryByProjectId(@ApiParam @Validated @RequestBody QueryDto<CRoleDto.QueryRoleById> params) {
         params.getParam().setNum(0);
-//        CRoleVo.QueryRole queryRole = roleService.queryShowRole(params.getParam(), params.getUserId());
-        CRoleVo.QueryRole queryRole = roleCarService.queryShowRoleCar(params.getParam(), params.getUserId());
-//        List<CRoleVo.RoleInfo> r1 = new ArrayList<>();
-//        List<CRoleVo.RoleInfo> r2 = new ArrayList<>();
-//        //处理角色，只查看自己所属的角色
-//        if(ObjectUtil.isNotNull(queryRole)){
-//            if(CollectionUtil.isNotEmpty(queryRole.getVisibleList())){
-//                queryRole.getVisibleList().forEach(roleInfo -> {
-//                    if(roleInfo.getMine() == 1){
-//                        r1.add(roleInfo);
-//                    }else {
-//                        r2.add(roleInfo);
-//                    }
-//                });
-//            }
-//            if(CollectionUtil.isNotEmpty(queryRole.getInvisibleList())){
-//                queryRole.getInvisibleList().forEach(roleInfo -> {
-//                    if(roleInfo.getMine() == 1){
-//                        r1.add(roleInfo);
-//                    }else {
-//                        r2.add(roleInfo);
-//                    }
-//                });
-//            }
-//        }
-//        queryRole.setVisibleList(r1);
-//        queryRole.setInvisibleList(r2);
+        CRoleVo.QueryRole queryRole = roleService.queryShowRole(params.getParam(), params.getUserId());
+//        CRoleVo.QueryRole queryRole = roleCarService.queryShowRoleCar(params.getParam(), params.getUserId());
+        List<CRoleVo.RoleInfo> r1 = new ArrayList<>();
+        List<CRoleVo.RoleInfo> r2 = new ArrayList<>();
+        //处理角色，只查看自己所属的角色
+        if(ObjectUtil.isNotNull(queryRole)){
+            if(CollectionUtil.isNotEmpty(queryRole.getVisibleList())){
+                queryRole.getVisibleList().forEach(roleInfo -> {
+                    if(roleInfo.getMine() == 1){
+                        r1.add(roleInfo);
+                    }else {
+                        r2.add(roleInfo);
+                    }
+                });
+            }
+            if(CollectionUtil.isNotEmpty(queryRole.getInvisibleList())){
+                queryRole.getInvisibleList().forEach(roleInfo -> {
+                    if(roleInfo.getMine() == 1){
+                        r1.add(roleInfo);
+                    }else {
+                        r2.add(roleInfo);
+                    }
+                });
+            }
+        }
+        queryRole.setVisibleList(r1);
+        queryRole.setInvisibleList(r2);
 
         return JsonResponse.newInstance().ok(queryRole);
     }
diff --git a/src/main/resources/mapper_dao/OrganizationDao.xml b/src/main/resources/mapper_dao/OrganizationDao.xml
index 54c8375..daae5aa 100644
--- a/src/main/resources/mapper_dao/OrganizationDao.xml
+++ b/src/main/resources/mapper_dao/OrganizationDao.xml
@@ -407,6 +407,7 @@
             t1.detail_id = t2.detail_id
             and t1.detail_id = t2.detail_id
             and t2.detail_id = t3.detail_id
+            GROUP BY t1.detail_id
         )h
         LEFT JOIN
         (
@@ -457,6 +458,8 @@
         </choose>
         )t on h.detail_id = t.detail_id
         LEFT JOIN t_qcp_questionnaire_detail d on h.detail_id = d.id and rec_status = 0
+        WHERE
+        d.submit_status = 1
         ORDER BY `value` DESC
     </select>