Index: forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java =================================================================== diff -u -r16407 -r16411 --- forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java (.../LogManagerImpl.java) (revision 16407) +++ forgon-core/src/main/java/com/forgon/log/service/LogManagerImpl.java (.../LogManagerImpl.java) (revision 16411) @@ -19,6 +19,7 @@ import com.forgon.directory.vo.LoginUserData; import com.forgon.log.model.Log; import com.forgon.tools.hibernate.ObjectDao; +import com.forgon.tools.json.JSONUtil; import com.forgon.tools.string.StringTools; public class LogManagerImpl implements LogManager { @@ -228,12 +229,8 @@ jbarcode.put("条码尾", barcodeEnd); json.put("扫描条码", jbarcode); } - if(barcodeType != null){ - json.put("条码类型", barcodeType); - } - if(barcodeName != null){ - json.put("名称", barcodeName); - } + JSONUtil.addLogProperty(json, "条码类型", barcodeType); + JSONUtil.addLogProperty(json, "名称", barcodeName); saveLog(loginUser, model + "模块", Log.TYPE_ADD,json); }