Merge branch 'dev/20200426_2nd' into debug

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -173,17 +173,16 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
             BeanUtil.copyProperties(getDetailVO, analyzeVO);
             List<MsgDTO> msgDTOList = getMsg(analyzeVO);
             if (ListUtil.isNotEmpty(msgDTOList)) {
-
-            }
-            // 从qc_question_info的cases_entry_ids获取
-            Map<String, Object> paramMap = new HashMap<>();
-            paramMap.put("hospitalId", hospitalId);
-            paramMap.put("casesEntryIds", msgDTOList.stream().map(r -> r.getCasesEntryId()).collect(Collectors.toList()));
-            Map<Long, List<QuestionEntryDTO>> quesEntryMap = qcQuestionFacade.getByCaseEntryIdsFac(paramMap);
-            for (MsgDTO msgDTO : msgDTOList) {
-                if (quesEntryMap.get(msgDTO.getCasesEntryId()) != null) {
-                    msgDTO.setPageKeyList(quesEntryMap.get(msgDTO.getCasesEntryId())
-                            .stream().map(r -> r.getId()).collect(Collectors.toList()));
+                // 从qc_question_info的cases_entry_ids获取
+                Map<String, Object> paramMap = new HashMap<>();
+                paramMap.put("hospitalId", hospitalId);
+                paramMap.put("casesEntryIds", msgDTOList.stream().map(r -> r.getCasesEntryId()).collect(Collectors.toList()));
+                Map<Long, List<QuestionEntryDTO>> quesEntryMap = qcQuestionFacade.getByCaseEntryIdsFac(paramMap);
+                for (MsgDTO msgDTO : msgDTOList) {
+                    if (quesEntryMap.get(msgDTO.getCasesEntryId()) != null) {
+                        msgDTO.setPageKeyList(quesEntryMap.get(msgDTO.getCasesEntryId())
+                                .stream().map(r -> r.getId()).collect(Collectors.toList()));
+                    }
                 }
             }
             // 根据模块分组

src/main/resources/mapper/SysRoleMapper.xml

@@ -35,7 +35,8 @@
                     t2.parent_id AS parentId,
                     t3.id AS permissionId,
                     t3.`name` AS permissionName,
-                    t2.order_no AS orderNo
+                    t2.order_no AS orderNo,
+                    t1.id AS menuPermissionId
                 FROM
                     sys_menu t2
                 LEFT JOIN sys_menu_permission t1 ON t1.is_deleted = 'N'
@@ -53,6 +54,6 @@
         AND t6.permission_id = t4.permissionId
         AND t6.role_id = #{roleId}
         ORDER BY
-            orderNo ASC,menuId ASC
+            orderNo ASC,menuId ASC,menuPermissionId ASC
      </select>
 </mapper>