2.2.0

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

@@ -174,10 +174,16 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
         JSONObject category = data.getJSONObject("category");
         String categoryEvidenceType = null;
         if(category != null){
-            categoryEvidenceType = category.getString("evidenceType");
-            sceneMaterialEvidence.put("category", String.valueOf(category.getInteger("resourceId")));
-            sceneMaterialEvidence.put("materialEvidenceTypeDict", categoryEvidenceType);
-            sceneMaterialEvidence.put("materialEvidenceType", category.getString("evidenceKey"));
+            if(StrUtil.isNotEmpty(category.getString("type")) && category.getString("type").equals("input")){//文本框输入
+                sceneMaterialEvidence.put("category", "12");//手动输入，默认为其它 类型
+                sceneMaterialEvidence.put("materialEvidenceTypeDict", null);
+                sceneMaterialEvidence.put("materialEvidenceType", category.getString("name"));
+            }else{
+                categoryEvidenceType = category.getString("evidenceType");
+                sceneMaterialEvidence.put("category", String.valueOf(category.getInteger("resourceId")));
+                sceneMaterialEvidence.put("materialEvidenceTypeDict", categoryEvidenceType);
+                sceneMaterialEvidence.put("materialEvidenceType", category.getString("evidenceKey"));
+            }
         }
         //推断 设备
         JSONObject species = data.getJSONObject("species");