dengsixing преди 3 дни
родител
ревизия
b3eb83c2d4
променени са 1 файла, в които са добавени 1 реда и са изтрити 1 реда
  1. 1 1
      src/main/java/com/fdkankan/scene/service/impl/SceneEvidenceServiceImpl.java

+ 1 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneEvidenceServiceImpl.java

@@ -218,7 +218,7 @@ public class SceneEvidenceServiceImpl extends ServiceImpl<ISceneEvidenceMapper,
             sceneElectroEvidence.put("evidenceType1", categoryEvidenceType);
             sceneElectroEvidence.put("evidenceType1", categoryEvidenceType);
             sceneElectroEvidence.put("evidenceType2", speciesEvidenceType);
             sceneElectroEvidence.put("evidenceType2", speciesEvidenceType);
             //电脑品牌
             //电脑品牌
-            if(StrUtil.isNotEmpty(standard.getString("type")) || standard.getString("type").equals("input")){
+            if(StrUtil.isNotEmpty(standard.getString("type")) && standard.getString("type").equals("input")){
                 sceneElectroEvidence.put("brand", standard.getString("name"));
                 sceneElectroEvidence.put("brand", standard.getString("name"));
             }else{
             }else{
                 sceneElectroEvidence.put("brand", standard.getString("evidenceName"));
                 sceneElectroEvidence.put("brand", standard.getString("evidenceName"));