|
|
@@ -177,8 +177,9 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
|
|
|
|
|
|
@Override
|
|
|
public InLnstLrxx searchLr(String lrzjhm) {
|
|
|
+ String jmzjhm = SecurityUtils.sm4encrypt_ECB(EncryptionUtils.key, lrzjhm);
|
|
|
return zwywLrJbxxMapper.selectOne(new LambdaQueryWrapper<InLnstLrxx>().and(wq ->
|
|
|
- wq.eq(InLnstLrxx::getLrZjhm, lrzjhm).or().eq(InLnstLrxx::getLrCydh, lrzjhm)));
|
|
|
+ wq.eq(InLnstLrxx::getLrZjhm, jmzjhm).or().eq(InLnstLrxx::getLrCydh, jmzjhm)));
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
@@ -337,17 +338,16 @@ public class ZwywLrJbxxServiceImpl implements IZwywLrJbxxService {
|
|
|
zwywLrJbxx.setLrXb(xb);
|
|
|
}
|
|
|
} catch (Exception ignored) {}
|
|
|
- int res = zwywLrJbxxMapper.insert(zwywLrJbxx);
|
|
|
InLnstShxx shxx = new InLnstShxx();
|
|
|
BeanUtil.copyProperties(zwywLrJbxx, shxx, new CopyOptions().ignoreNullValue());
|
|
|
// 拒绝后修改必须审核
|
|
|
shxx.setSqyy("老人自主申报");
|
|
|
shxx.setId(IdUtils.simpleUUID());
|
|
|
- shxx.setLrId(zwywLrJbxx.getId());
|
|
|
+ shxx.setLrId(userId);
|
|
|
shxx.setSqsj(DateUtils.dateTimeNow());
|
|
|
shxx.setLzzt(zwywLrJbxx.getLzzt());
|
|
|
insertShxx(shxx);
|
|
|
- return res;
|
|
|
+ return zwywLrJbxxMapper.insert(zwywLrJbxx);
|
|
|
}
|
|
|
|
|
|
@Transactional
|
