|
@@ -190,9 +190,13 @@ public class MaterialInfoServiceImpl extends ServiceImpl<MaterialInfoMapper, Mat
|
|
queryWrapper.orderByDesc("create_time");
|
|
queryWrapper.orderByDesc("create_time");
|
|
queryWrapper.last("limit 1");
|
|
queryWrapper.last("limit 1");
|
|
MaterialParameter materialParameter = materialParameterMapper.selectOne(queryWrapper);
|
|
MaterialParameter materialParameter = materialParameterMapper.selectOne(queryWrapper);
|
|
- materialParameter.setMaterialId(materialId);
|
|
|
|
|
|
+
|
|
if (!Check.isNull(materialParameter)) {
|
|
if (!Check.isNull(materialParameter)) {
|
|
json.put("parameter", materialParameter);
|
|
json.put("parameter", materialParameter);
|
|
|
|
+ } else {
|
|
|
|
+ MaterialParameter materialParameter1 = new MaterialParameter();
|
|
|
|
+ materialParameter1.setMaterialId(materialId);
|
|
|
|
+ json.put("parameter", materialParameter1);
|
|
}
|
|
}
|
|
JSONObject ascriptionJson = materialAscriptionMapper.selectByMaterialId(materialId);
|
|
JSONObject ascriptionJson = materialAscriptionMapper.selectByMaterialId(materialId);
|
|
if (!Check.isNull(ascriptionJson)) {
|
|
if (!Check.isNull(ascriptionJson)) {
|