Index: ssts-web/src/main/webapp/dataUpdater/sqls/5.0.47_5.0.48.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.47_5.0.48.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.47_5.0.48.sql (revision 40682) @@ -0,0 +1,2 @@ +update ImageFile set tousseDefinition_id = objectId where imageType in ('器械包图片', '器械包说明书') and tousseDefinition_id is null; +update ImageFile set toussePackingTeaching_id = objectId where imageType in ('清洗操作指引图片', '器械包装配教学图片') and toussePackingTeaching_id is null; \ No newline at end of file Index: forgon-tools/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r40588 -r40682 --- forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 40588) +++ forgon-tools/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 40682) @@ -29,7 +29,7 @@ "4.9.63","4.9.64","4.9.65","4.9.66","4.9.67","4.9.68","4.9.69","4.9.70","4.9.71","4.9.72","4.9.73","4.9.74","4.9.75","4.9.76","4.9.77","4.9.78","4.9.79","4.9.80","4.9.81","4.9.82","4.9.83","4.9.84","4.9.85", "4.9.86","4.9.87","4.9.88","4.9.89","4.9.90","4.9.91","4.9.92","4.9.93","4.9.94","4.9.95","4.9.96","4.9.97","4.9.98","4.9.99","5.0.0","5.0.1","5.0.2","5.0.3","5.0.4","5.0.5","5.0.6","5.0.7", "5.0.8","5.0.9","5.0.10","5.0.11","5.0.12","5.0.13","5.0.14","5.0.15","5.0.16","5.0.17","5.0.18","5.0.19","5.0.20","5.0.21","5.0.22","5.0.23","5.0.24","5.0.25","5.0.26","5.0.27","5.0.28","5.0.29","5.0.30","5.0.31", - "5.0.32","5.0.33","5.0.34","5.0.35","5.0.36","5.0.37","5.0.38","5.0.39","5.0.40","5.0.41","5.0.42","5.0.43","5.0.44","5.0.45","5.0.46","5.0.47"}; + "5.0.32","5.0.33","5.0.34","5.0.35","5.0.36","5.0.37","5.0.38","5.0.39","5.0.40","5.0.41","5.0.42","5.0.43","5.0.44","5.0.45","5.0.46","5.0.47","5.0.48"}; // 版本列表(4.0版本升级4.1版需要分两步:先从4.0升到4.1.0、然后从4.1.0升级4.1最新版本) /*public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageAndVideoAction.java =================================================================== diff -u -r34210 -r40682 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageAndVideoAction.java (.../UploadImageAndVideoAction.java) (revision 34210) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/imagefilemanager/action/UploadImageAndVideoAction.java (.../UploadImageAndVideoAction.java) (revision 40682) @@ -220,7 +220,9 @@ // 保存图片记录到数据库 String imageIds = ""; - imageFileManager.batchSaveImage(uploadImageList); + if(!imageFileManager.saveImageFile(uploadImageList, imageType, objectId)){ + imageFileManager.batchSaveImage(uploadImageList); + } for (int i = 0; i < uploadImageList.size(); i++) { ImageFile imageFile = uploadImageList.get(i); imageIds = StringTools.uniteTwoStringBySemicolon(imageIds, imageFile.getId().toString(), ",");