2.2.0

src/main/java/com/fdkankan/scene/service/impl/SceneEvidenceServiceImpl.java

@@ -202,14 +202,6 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             }
 
         }
-        //提取方法
-        JSONObject method = data.getJSONObject("method");
-        if(method != null){//下拉选
-            sceneMaterialEvidence.put("collectionModeDict", method.getString("evidenceType"));
-            sceneMaterialEvidence.put("collectionMode", method.getString("evidenceKey"));
-        }else{//手动录入
-            sceneMaterialEvidence.put("collectionMode", data.getString("collectionModeName"));
-        }
 
         //电子物证特殊信息,如果类型代码是电子物证就是电子物证信息
         if("SB-DZWZLBDM".equals(categoryEvidenceType)){
@@ -222,10 +214,19 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             if(StrUtil.isNotEmpty(standard.getString("type")) && standard.getString("type").equals("input")){
                 sceneElectroEvidence.put("brand", standard.getString("name"));
             }else{
-                sceneElectroEvidence.put("brand", standard.getString("evidenceName"));
+                sceneElectroEvidence.put("brand", standard.getString("evidenceKey"));
             }
         }
 
+        //提取方法
+        JSONObject method = data.getJSONObject("method");
+        if(method != null){//下拉选
+            sceneMaterialEvidence.put("collectionModeDict", method.getString("evidenceType"));
+            sceneMaterialEvidence.put("collectionMode", method.getString("evidenceKey"));
+        }else{//手动录入
+            sceneMaterialEvidence.put("collectionMode", data.getString("collectionModeName"));
+        }
+
         //上传图片
         //获取到第一张图片
         JSONArray medias = data.getJSONArray("media");