|
@@ -122,8 +122,10 @@ public class TaRaiseServiceImpl extends ServiceImpl<TaRaiseMapper, TaRaise> impl
|
122
|
122
|
if (raiseRecordId != null || mayPerson) {
|
123
|
123
|
QueryWrapper<TaRaiseRecord> wrapper = new QueryWrapper<>();
|
124
|
124
|
wrapper.eq(raiseRecordId != null,"raise_record_id", raiseRecordId);
|
125
|
|
- wrapper.eq(mayPerson, "raise_id", taRaise.getRaiseId());
|
126
|
|
- wrapper.eq(mayPerson,"person_id", personId);
|
|
125
|
+ if (mayPerson){
|
|
126
|
+ wrapper.eq( "raise_id", taRaise.getRaiseId());
|
|
127
|
+ wrapper.eq("person_id", personId);
|
|
128
|
+ }
|
127
|
129
|
wrapper.eq("status", CommConstant.STATUS_NORMAL);
|
128
|
130
|
wrapper.last("limit 1");
|
129
|
131
|
taRaiseRecord = taRaiseRecordMapper.selectOne(wrapper);
|