|
@@ -409,7 +409,9 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
|
|
.setTradeAreaName(tbTradeArea.getName()).setUpdateTime(new Date());
|
|
.setTradeAreaName(tbTradeArea.getName()).setUpdateTime(new Date());
|
|
tbPeopleService.saveOrUpdate(tbPeople);
|
|
tbPeopleService.saveOrUpdate(tbPeople);
|
|
if (dclBorderList1.size() > 0) {
|
|
if (dclBorderList1.size() > 0) {
|
|
- tbGroup.setLeaderId(tbPeople.getId());
|
|
|
|
|
|
+ tbGroup.setLeaderId(tbPeople.getId())
|
|
|
|
+ .setLeaderName(tbPeople.getName())
|
|
|
|
+ .setLeaderPhone(tbPeople.getPhone());
|
|
|
|
|
|
AppUserDto appUser = adminInterface.getByFkId(tbPeople.getId());
|
|
AppUserDto appUser = adminInterface.getByFkId(tbPeople.getId());
|
|
if (appUser != null) {
|
|
if (appUser != null) {
|
|
@@ -420,8 +422,6 @@ public class TbGroupService extends ServiceImpl<TbGroupMapper, TbGroup> implemen
|
|
}
|
|
}
|
|
//修改
|
|
//修改
|
|
BeanUtils.copyProperties(groupDto, tbGroup);
|
|
BeanUtils.copyProperties(groupDto, tbGroup);
|
|
- tbGroup.setLeaderName(dclBorderList.get(0).getDeclareName())
|
|
|
|
- .setLeaderPhone(dclBorderList.get(0).getDeclareTel());
|
|
|
|
tbGroup.setUpdateTime(new Date());
|
|
tbGroup.setUpdateTime(new Date());
|
|
super.saveOrUpdate(tbGroup);
|
|
super.saveOrUpdate(tbGroup);
|
|
return true;
|
|
return true;
|