|
|
@ -1681,7 +1681,7 @@ public class ImsDutyMainServiceImpl extends BaseServiceImpl<ImsDutyMainMapper, I |
|
|
|
eq(ImsDutyMainPersonEntity::getDutyMainId, s.getId()); |
|
|
|
eq(ImsDutyMainPersonEntity::getDutyMainId, s.getId()); |
|
|
|
last("limit 1"); |
|
|
|
last("limit 1"); |
|
|
|
}}); |
|
|
|
}}); |
|
|
|
if (StringUtils.isNotBlank(imsDutyMainPersonEntity.getDutyGroupName())){ |
|
|
|
if (ObjectUtil.isNotEmpty(imsDutyMainPersonEntity)&&StringUtils.isNotBlank(imsDutyMainPersonEntity.getDutyGroupName())){ |
|
|
|
s.setGroupName(imsDutyMainPersonEntity.getDutyGroupName()); |
|
|
|
s.setGroupName(imsDutyMainPersonEntity.getDutyGroupName()); |
|
|
|
}else { |
|
|
|
}else { |
|
|
|
s.setGroupName("临时班组"); |
|
|
|
s.setGroupName("临时班组"); |
|
|
|