|
@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.github.jfcloud.admin.api.sys.dto.message.MessageUserDTO;
|
|
@@ -129,7 +130,12 @@ public class SampleInfoServiceImpl extends ServiceImpl<SampleInfoMapper, SampleI
|
|
|
|
|
|
BeanUtil.copyProperties(vo, sampleInfo);
|
|
|
sampleInfo.setInspector(vo.getInspector().toJSONString());
|
|
|
- sampleInfo.updateById();
|
|
|
+ LambdaUpdateWrapper<SampleInfo> wrapper = new LambdaUpdateWrapper<SampleInfo>()
|
|
|
+ .eq(SampleInfo::getId, id)
|
|
|
+ .set(vo.getApplicantId() == null, SampleInfo::getApplicantId, null)
|
|
|
+ .set(vo.getDepartLeaderId() == null, SampleInfo::getDepartLeaderId, null)
|
|
|
+ .set(vo.getProjectManageId() == null, SampleInfo::getProjectManageId, null);
|
|
|
+ baseMapper.update(sampleInfo, wrapper);
|
|
|
|
|
|
getServiceByType(vo.getType()).save(id, vo);
|
|
|
}
|