|
|
@@ -95,18 +95,18 @@ public class RetrieveRecordService extends ServiceImpl<RetrieveRecordMapper, Ret
|
|
|
* @return
|
|
|
*/
|
|
|
public List<Integer> deleteRetrieveRecord(RetrieveRecordDeDTO retrieveRecordDeDTO) {
|
|
|
- PersonnelVO personnelVO=cacheUtils.getLoginUser(loginUtils.getId());
|
|
|
+ PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
|
|
|
List<Integer> ids = retrieveRecordDeDTO.getIds();
|
|
|
Boolean isAll = retrieveRecordDeDTO.getIsAll();
|
|
|
- UpdateWrapper<RetrieveRecord> retrieveRecordUpdateWrapper =new UpdateWrapper<>();
|
|
|
- retrieveRecordUpdateWrapper.eq("create_id",personnelVO.getId());
|
|
|
- retrieveRecordUpdateWrapper.set("is_delete",true);
|
|
|
+ UpdateWrapper<RetrieveRecord> retrieveRecordUpdateWrapper = new UpdateWrapper<>();
|
|
|
+ retrieveRecordUpdateWrapper.eq("create_id", personnelVO.getId());
|
|
|
+ retrieveRecordUpdateWrapper.set("is_delete", true);
|
|
|
if (isAll != null && isAll) {
|
|
|
|
|
|
} else {
|
|
|
//判空
|
|
|
if (ids != null && ids.size() > 0) {
|
|
|
- retrieveRecordUpdateWrapper.in("id",ids);
|
|
|
+ retrieveRecordUpdateWrapper.in("id", ids);
|
|
|
}
|
|
|
}
|
|
|
this.update(retrieveRecordUpdateWrapper);
|
|
|
@@ -126,8 +126,8 @@ public class RetrieveRecordService extends ServiceImpl<RetrieveRecordMapper, Ret
|
|
|
String createId = personnelVO.getId();
|
|
|
LambdaQueryWrapper<RetrieveRecord> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(RetrieveRecord::getCreateId, createId)
|
|
|
- .and(i->i.eq(RetrieveRecord::getIsDelete,false).or().isNull(RetrieveRecord::getIsDelete))
|
|
|
- .and(i->i.eq(RetrieveRecord::getIfBySystem,true).or().isNull(RetrieveRecord::getIfBySystem))
|
|
|
+ .and(i -> i.eq(RetrieveRecord::getIsDelete, false).or().isNull(RetrieveRecord::getIsDelete))
|
|
|
+ .and(i -> i.eq(RetrieveRecord::getIfBySystem, true).or().isNull(RetrieveRecord::getIfBySystem))
|
|
|
.orderByDesc(RetrieveRecord::getRetrieveTime)
|
|
|
.orderByDesc(RetrieveRecord::getCreateTime);
|
|
|
IPage<RetrieveRecord> retrieveRecords = this.page(new Page<>(retrieveRecordQueryDTO.getCurrent(), retrieveRecordQueryDTO.getSize()), queryWrapper);
|
zero