diff --git a/agent-manager/src/main/java/com/mortals/xhx/module/base/service/impl/BaseAreaServiceImpl.java b/agent-manager/src/main/java/com/mortals/xhx/module/base/service/impl/BaseAreaServiceImpl.java index aa5a61c2026e10e449da2fda2159d13031139bfa..9fe92d481e44f218880a103e3afa3c9b625062a4 100644 --- a/agent-manager/src/main/java/com/mortals/xhx/module/base/service/impl/BaseAreaServiceImpl.java +++ b/agent-manager/src/main/java/com/mortals/xhx/module/base/service/impl/BaseAreaServiceImpl.java @@ -136,6 +136,9 @@ public class BaseAreaServiceImpl extends AbstractCRUDServiceImpl<BaseAreaDao, Ba entity = new BaseAreaEntity(); entity.initAttrValue(); BeanUtils.copyProperties(group, entity, BeanUtil.getNullPropertyNames(group)); + + entity.setName(group.getShortName()); + entity.setCreateTime(new Date()); entity.setCreateUserId(1L); //log.info("鏂板鏁版嵁:{}", JSON.toJSONString(group)); diff --git a/agent-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java b/agent-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java index 2c0c9baf8444104939b25851b3e72b6c584441fb..29d58ff900543f115a8c8e97c047008678130cd6 100644 --- a/agent-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java +++ b/agent-manager/src/main/java/com/mortals/xhx/module/staff/service/impl/StaffServiceImpl.java @@ -196,4 +196,19 @@ public class StaffServiceImpl extends AbstractCRUDServiceImpl<StaffDao, StaffEnt } return Rest.ok(); } + + + @Override + protected void removeBefore(Long[] ids, Context context) throws AppException { + for (Long id : ids) { + StaffEntity staffEntity = this.get(id, context); + if(!ObjectUtils.isEmpty(staffEntity)&&!ObjectUtils.isEmpty(staffEntity.getUserId())){ + userService.remove(staffEntity.getUserId(), context); + } + } + + + + super.removeBefore(ids, context); + } } \ No newline at end of file