Merge remote-tracking branch 'origin/dev/20200426_2nd' into dev/20200426_2nd

src/main/java/com/diagbot/dto/GetModuleInfoOneDTO.java

@@ -26,6 +26,4 @@ public class GetModuleInfoOneDTO {
     private String modeName;
     //模板明细
     private Map<Integer, List<QcModuleDetailDTO>> moduleDetail;
-    //备注
-    private String remark;
 }

src/main/java/com/diagbot/dto/QuestionDTO.java

@@ -29,5 +29,5 @@ public class QuestionDTO {
     private Integer position; //显示位置(1：靠右显示)
     private String casesEntryIds;//质控条目id列表
     private List<QuestionDTO> questionMapping = new ArrayList<>();     //下级标签
-    private String remark;//备注
+//    private String remark;//备注
 }

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

@@ -81,11 +81,12 @@ public class QcModuleInfoFacade extends QcModuleInfoServiceImpl {
      * @param getModuleMapVO
      * @return
      */
+//    @Cacheable(value = "cache", key = "'qcmodule'")
     public Map<Long, GetModuleInfoOneDTO> getModuleMap(GetModuleMapVO getModuleMapVO) {
         Map<Long, GetModuleInfoOneDTO> res = new LinkedHashMap<>();
         List<QcModuleInfo> qcModuleInfoList = this.list(new QueryWrapper<QcModuleInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("mode_id", getModuleMapVO.getModeId())
+                .eq(getModuleMapVO.getModeId() != null, "mode_id", getModuleMapVO.getModeId())
                 .eq("hospital_id", getModuleMapVO.getHospitalId())
         );
         List<Long> ids = qcModuleInfoList.stream().map(r -> r.getId()).collect(Collectors.toList());

src/main/resources/mapper/SysUserMapper.xml

@@ -50,7 +50,7 @@
                 SELECT DISTINCT
                 t4.user_id AS userId,
                 t4.hospital_id AS hospitalId,
-                group_concat(t5.dept_name) AS deptName
+                group_concat(t5.dept_name order by t5.dept_name ASC) AS deptName
                 FROM
                 sys_user_dept t4,
                 bas_dept_info t5
@@ -69,7 +69,7 @@
                 SELECT DISTINCT
                 t4.user_id AS userId,
                 t4.hospital_id AS hospitalId,
-                group_concat(t5.dept_name) AS deptName
+                group_concat(t5.dept_name order by t5.dept_name ASC) AS deptName
                 FROM
                 sys_user_dept t4,
                 bas_dept_info t5
@@ -88,7 +88,7 @@
                 INNER JOIN (
                 SELECT
                 t8.user_id AS userId,
-                group_concat(t9.`name`) AS roleName
+                group_concat(t9.`name` order by t9.id ASC) AS roleName
                 FROM
                 sys_user_role t8,
                 sys_role t9
@@ -105,7 +105,7 @@
                 LEFT JOIN (
                 SELECT
                 t8.user_id AS userId,
-                group_concat(t9.`name`) AS roleName
+                group_concat(t9.`name` order by t9.id ASC) AS roleName
                 FROM
                 sys_user_role t8,
                 sys_role t9