Merge branch 'dbdx' of http://192.168.1.43:3000/v2/zd-parents into dbdx

zd-common/common-core/src/main/java/com/zd/common/core/exception/GlobalExceptionHandler.java

@@ -73,10 +73,11 @@ public class GlobalExceptionHandler {
     public AjaxResult handleRuntimeException(RuntimeException e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生未知异常.", requestURI, e);
-        if (e.getCause() != null) {
+        /*if (e.getCause() != null) {
             return AjaxResult.error(e.getCause().toString());
         }
-        return AjaxResult.error(e.toString());
+        return AjaxResult.error(e.toString());*/
+        return AjaxResult.error("业务异常");
     }
 
     /**
@@ -86,7 +87,8 @@ public class GlobalExceptionHandler {
     public AjaxResult handleException(Exception e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生系统异常.", requestURI, e);
-        return AjaxResult.error(e.getMessage());
+        //return AjaxResult.error(e.getMessage());
+        return AjaxResult.error("业务异常");
     }
 
     /**

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpClassifyDetailMapper.xml

@@ -68,7 +68,7 @@
 
     <select id="selectXxpClassifyBySubjectId" resultType="com.zd.laboratory.domain.XxpClassifyDetail" resultMap="XxpClassifyDetailedResult">
          SELECT  info_content,info_classify_id  FROM xxp_classify_detail where is_collective=2 OR id in
-         (SELECT classify_detail_id  FROM  xxp_classify_subject where  subject_id=#{subjectId}) GROUP BY sort ASC,create_time DESC
+         (SELECT classify_detail_id  FROM  xxp_classify_subject where  subject_id=#{subjectId}) GROUP BY sort,create_time order by sort ASC,create_time DESC
     </select>
 
     <insert id="insertXxpClassifyDetailed" parameterType="com.zd.laboratory.domain.XxpClassifyDetail">

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/XxpClassifyMapper.xml

@@ -81,7 +81,7 @@
                is_show,
                show_colour
         from xxp_classify t WHERE t.id IN (SELECT classify_id FROM xxp_classify_subject WHERE subject_id=#{id}) and is_show=1
-        GROUP BY t.sort ASC,create_time DESC
+        GROUP BY t.sort ,create_time order by t.sort ASC,create_time DESC
     </select>
 
     <insert id="insertXxpClassify" parameterType="com.zd.laboratory.domain.XxpClassify">