gaodm před 5 roky
rodič
revize
4f4b88243f

+ 4 - 2
icss-service/src/main/java/com/diagbot/facade/TemplateNormFacade.java

@@ -126,12 +126,12 @@ public class TemplateNormFacade<tranServiceClient> extends TemplateInfoServiceIm
         //更新关系
         //更新关系
         if (res) {
         if (res) {
             Long orderNo = folderMappingServiceImpl.getMaxOrderNo(templateNormUpVO.getFolderId());
             Long orderNo = folderMappingServiceImpl.getMaxOrderNo(templateNormUpVO.getFolderId());
-            Long num = orderNo == null ? 0 : orderNo;
+//            Long num = orderNo == null ? 0 : orderNo;
             res = folderMappingFacade.update(new UpdateWrapper<FolderMapping>()
             res = folderMappingFacade.update(new UpdateWrapper<FolderMapping>()
                     .eq("template_id", templateNormUpVO.getId())
                     .eq("template_id", templateNormUpVO.getId())
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
                     .set("folder_id", templateNormUpVO.getFolderId())
                     .set("folder_id", templateNormUpVO.getFolderId())
-                    .set("order_no", num));
+                    .set("order_no", orderNo));
         }
         }
         return res;
         return res;
 
 
@@ -198,6 +198,8 @@ public class TemplateNormFacade<tranServiceClient> extends TemplateInfoServiceIm
             folderMapping.setTemplateId(num);
             folderMapping.setTemplateId(num);
             folderMapping.setCreator(templateNormsVO.getDoctorId().toString());
             folderMapping.setCreator(templateNormsVO.getDoctorId().toString());
             folderMapping.setGmtCreate(DateUtil.now());
             folderMapping.setGmtCreate(DateUtil.now());
+            Long orderNo = folderMappingServiceImpl.getMaxOrderNo(templateNormsVO.getFolderId());
+            folderMapping.setOrderNo(orderNo);
             res = folderMappingFacade.save(folderMapping);
             res = folderMappingFacade.save(folderMapping);
         }
         }
 
 

+ 1 - 1
icss-service/src/main/resources/mapper/FolderMappingMapper.xml

@@ -17,7 +17,7 @@
     </resultMap>
     </resultMap>
 
 
     <select id="getMaxOrderNo" resultType="Long">
     <select id="getMaxOrderNo" resultType="Long">
-        SELECT MAX(order_no)+1 FROM icss_folder_mapping WHERE is_deleted ="N"
+        SELECT IFNULL(MAX(order_no)+1, 0) FROM icss_folder_mapping WHERE is_deleted ="N"
         <if test="folderId != null ">
         <if test="folderId != null ">
            AND folder_id = #{folderId}
            AND folder_id = #{folderId}
         </if>
         </if>