Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r26583 -r26908
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 26583)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 26908)
@@ -317,10 +317,17 @@
 				img = imageFileManager.getImageByIdAndType(Long.parseLong(id),
 						ImageFile.IMAGE_TYPE_TOUSSEPACKING, page,originalImg);
 
-			}else {
-				TousseDefinition tousseDefinition = tousseDefinitionManager.get(Long.parseLong(id));
-				img = imageFileManager.getImageByIdAndType(tousseDefinition.getAncestorID(),
+			} else {
+				img = imageFileManager.getImageByIdAndType(Long.parseLong(id),
 						imageType, page,originalImg);
+				// 解决jira问题： GZZYYFY-56 在装配管理模块不能正常查看图片信息
+				if (img == null) {
+					TousseDefinition tousseDefinition = tousseDefinitionManager.get(Long.parseLong(id));
+					if (tousseDefinition != null) {
+						img = imageFileManager.getImageByIdAndType(tousseDefinition.getAncestorID(),
+								imageType, page,originalImg);
+					}
+				}
 			}
 
 			OutputStream outputStream = null;