|
@ -139,7 +139,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class); |
|
|
SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class); |
|
|
|
|
|
entity.setName(StringUtils.trim(entity.getName())); |
|
|
entity.setPids(getPidList(entity.getPid())); |
|
|
entity.setPids(getPidList(entity.getPid())); |
|
|
insert(entity); |
|
|
insert(entity); |
|
|
|
|
|
|
|
@ -215,7 +215,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class); |
|
|
SysDeptEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptEntity.class); |
|
|
|
|
|
entity.setName(StringUtils.trim(entity.getName())); |
|
|
//上级部门不能为自身
|
|
|
//上级部门不能为自身
|
|
|
if (entity.getId().equals(entity.getPid())) { |
|
|
if (entity.getId().equals(entity.getPid())) { |
|
|
throw new RenException(ErrorCode.SUPERIOR_DEPT_ERROR); |
|
|
throw new RenException(ErrorCode.SUPERIOR_DEPT_ERROR); |
|
@ -298,6 +298,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
|
|
|
|
|
|
sendMqMessage(dto); |
|
|
sendMqMessage(dto); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void packageGrid(SysDeptEntity entity, CustomerGridEntity customerGridEntity) { |
|
|
private void packageGrid(SysDeptEntity entity, CustomerGridEntity customerGridEntity) { |
|
|
customerGridEntity.setId(entity.getId().toString()); |
|
|
customerGridEntity.setId(entity.getId().toString()); |
|
|
customerGridEntity.setPid(entity.getPid().toString()); |
|
|
customerGridEntity.setPid(entity.getPid().toString()); |
|
@ -306,6 +307,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
customerGridEntity.setGridName(entity.getName()); |
|
|
customerGridEntity.setGridName(entity.getName()); |
|
|
customerGridEntity.setManageDistrict(entity.getName()); |
|
|
customerGridEntity.setManageDistrict(entity.getName()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void packageAgency(SysDeptEntity entity, CustomerAgencyEntity customerAgencyEntity) { |
|
|
private void packageAgency(SysDeptEntity entity, CustomerAgencyEntity customerAgencyEntity) { |
|
|
customerAgencyEntity.setId(entity.getId().toString()); |
|
|
customerAgencyEntity.setId(entity.getId().toString()); |
|
|
customerAgencyEntity.setPid(entity.getPid().toString()); |
|
|
customerAgencyEntity.setPid(entity.getPid().toString()); |
|
@ -321,6 +323,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit |
|
|
customerAgencyEntity.setLevel("community"); |
|
|
customerAgencyEntity.setLevel("community"); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private void packageDepartment(SysDeptEntity entity, CustomerDepartmentEntity customerDepartmentEntity) { |
|
|
private void packageDepartment(SysDeptEntity entity, CustomerDepartmentEntity customerDepartmentEntity) { |
|
|
customerDepartmentEntity.setId(entity.getId().toString()); |
|
|
customerDepartmentEntity.setId(entity.getId().toString()); |
|
|
customerDepartmentEntity.setAgencyId(entity.getPid().toString()); |
|
|
customerDepartmentEntity.setAgencyId(entity.getPid().toString()); |
|
|