Browse Source

字典获取customerId,修改生成token逻辑

feature/dangjian
mkh 4 years ago
parent
commit
d92e6f0227
  1. 23
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
  2. 14
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

23
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java

@ -86,6 +86,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
private CustomerDepartmentDao customerDepartmentDao; private CustomerDepartmentDao customerDepartmentDao;
@Resource @Resource
private CustomerGridDao customerGridDao; private CustomerGridDao customerGridDao;
@Resource
private SysDictDao sysDictDao;
private static final Logger logger = LoggerFactory.getLogger(SysDeptServiceImpl.class); private static final Logger logger = LoggerFactory.getLogger(SysDeptServiceImpl.class);
@ -147,12 +149,13 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
Result<CompleteDeptDTO> completeDeptDtoResult = this.getCompleteDept(entity.getId().toString()); Result<CompleteDeptDTO> completeDeptDtoResult = this.getCompleteDept(entity.getId().toString());
groupFeignClient.createPartyGroup(completeDeptDtoResult.getData()); groupFeignClient.createPartyGroup(completeDeptDtoResult.getData());
} }
//查询字典获取customer_id
SysDictEntity sysDictEntity = sysDictDao.selectDcp();
if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) { if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
//同步customer_grid //同步customer_grid
CustomerGridEntity customerGridEntity = new CustomerGridEntity(); CustomerGridEntity customerGridEntity = new CustomerGridEntity();
customerGridEntity.setId(entity.getId().toString()); customerGridEntity.setId(entity.getId().toString());
customerGridEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1"); customerGridEntity.setCustomerId(sysDictEntity.getDictValue());
customerGridEntity.setPid(entity.getPid().toString()); customerGridEntity.setPid(entity.getPid().toString());
customerGridEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":")); customerGridEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":"));
customerGridEntity.setSyncFlag(NumConstant.ZERO_STR); customerGridEntity.setSyncFlag(NumConstant.ZERO_STR);
@ -166,7 +169,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity(); CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity();
customerDepartmentEntity.setId(entity.getId().toString()); customerDepartmentEntity.setId(entity.getId().toString());
customerDepartmentEntity.setAgencyId(entity.getPid().toString()); customerDepartmentEntity.setAgencyId(entity.getPid().toString());
customerDepartmentEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1"); customerDepartmentEntity.setCustomerId(sysDictEntity.getDictValue());
customerDepartmentEntity.setDepartmentName(entity.getName()); customerDepartmentEntity.setDepartmentName(entity.getName());
customerDepartmentEntity.setDepartmentDuty(entity.getName()); customerDepartmentEntity.setDepartmentDuty(entity.getName());
customerDepartmentEntity.setTotalUser(NumConstant.ZERO); customerDepartmentEntity.setTotalUser(NumConstant.ZERO);
@ -176,7 +179,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
//同步agency //同步agency
CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity(); CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity();
customerAgencyEntity.setId(entity.getId().toString()); customerAgencyEntity.setId(entity.getId().toString());
customerAgencyEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1"); customerAgencyEntity.setCustomerId(sysDictEntity.getDictValue());
customerAgencyEntity.setPid(entity.getPid().toString()); customerAgencyEntity.setPid(entity.getPid().toString());
customerAgencyEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":")); customerAgencyEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":"));
customerAgencyEntity.setSyncFlag(NumConstant.ZERO_STR); customerAgencyEntity.setSyncFlag(NumConstant.ZERO_STR);
@ -224,7 +227,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
// 发送消息 // 发送消息
this.baseDao.updateById(entity); this.baseDao.updateById(entity);
//查询字典获取customer_id
SysDictEntity sysDictEntity = sysDictDao.selectDcp();
if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) { if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerGridEntity customerGridEntity = customerGridDao.selectById(dto.getId().toString()); CustomerGridEntity customerGridEntity = customerGridDao.selectById(dto.getId().toString());
if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) { if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
@ -236,12 +240,14 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
customerGridDao.updateById(customerGridEntity); customerGridDao.updateById(customerGridEntity);
} else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) { } else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity(); CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity();
customerDepartmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity,customerDepartmentEntity); packageDepartment(entity,customerDepartmentEntity);
customerDepartmentEntity.setTotalUser(customerGridEntity.getTotalUser()); customerDepartmentEntity.setTotalUser(customerGridEntity.getTotalUser());
customerDepartmentDao.insert(customerDepartmentEntity); customerDepartmentDao.insert(customerDepartmentEntity);
customerGridDao.deleteGridById(entity.getId().toString()); customerGridDao.deleteGridById(entity.getId().toString());
}else { }else {
CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity(); CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity();
customerAgencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity,customerAgencyEntity); packageAgency(entity,customerAgencyEntity);
customerAgencyEntity.setTotalUser(customerGridEntity.getTotalUser()); customerAgencyEntity.setTotalUser(customerGridEntity.getTotalUser());
customerAgencyDao.insert(customerAgencyEntity); customerAgencyDao.insert(customerAgencyEntity);
@ -251,6 +257,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
CustomerDepartmentEntity customerDepartmentEntity = customerDepartmentDao.selectById(dto.getId().toString()); CustomerDepartmentEntity customerDepartmentEntity = customerDepartmentDao.selectById(dto.getId().toString());
if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) { if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerGridEntity customerGridEntity = new CustomerGridEntity(); CustomerGridEntity customerGridEntity = new CustomerGridEntity();
customerGridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity,customerGridEntity); packageGrid(entity,customerGridEntity);
customerGridEntity.setTotalUser(customerDepartmentEntity.getTotalUser()); customerGridEntity.setTotalUser(customerDepartmentEntity.getTotalUser());
customerGridDao.insert(customerGridEntity); customerGridDao.insert(customerGridEntity);
@ -261,6 +268,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
customerDepartmentDao.updateById(customerDepartmentEntity); customerDepartmentDao.updateById(customerDepartmentEntity);
}else { }else {
CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity(); CustomerAgencyEntity customerAgencyEntity = new CustomerAgencyEntity();
customerAgencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity,customerAgencyEntity); packageAgency(entity,customerAgencyEntity);
customerAgencyEntity.setTotalUser(customerDepartmentEntity.getTotalUser()); customerAgencyEntity.setTotalUser(customerDepartmentEntity.getTotalUser());
customerAgencyDao.insert(customerAgencyEntity); customerAgencyDao.insert(customerAgencyEntity);
@ -270,12 +278,14 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
CustomerAgencyEntity customerAgencyEntity = customerAgencyDao.selectById(dto.getId().toString()); CustomerAgencyEntity customerAgencyEntity = customerAgencyDao.selectById(dto.getId().toString());
if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) { if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerGridEntity customerGridEntity = new CustomerGridEntity(); CustomerGridEntity customerGridEntity = new CustomerGridEntity();
customerGridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity,customerGridEntity); packageGrid(entity,customerGridEntity);
customerGridEntity.setTotalUser(customerAgencyEntity.getTotalUser()); customerGridEntity.setTotalUser(customerAgencyEntity.getTotalUser());
customerGridDao.insert(customerGridEntity); customerGridDao.insert(customerGridEntity);
customerAgencyDao.deleteAgencyById(entity.getId().toString()); customerAgencyDao.deleteAgencyById(entity.getId().toString());
} else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) { } else if (entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || entity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity(); CustomerDepartmentEntity customerDepartmentEntity = new CustomerDepartmentEntity();
customerDepartmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity,customerDepartmentEntity); packageDepartment(entity,customerDepartmentEntity);
customerDepartmentEntity.setTotalUser(customerAgencyEntity.getTotalUser()); customerDepartmentEntity.setTotalUser(customerAgencyEntity.getTotalUser());
customerDepartmentDao.insert(customerDepartmentEntity); customerDepartmentDao.insert(customerDepartmentEntity);
@ -290,7 +300,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
} }
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.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
customerGridEntity.setPid(entity.getPid().toString()); customerGridEntity.setPid(entity.getPid().toString());
customerGridEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":")); customerGridEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":"));
customerGridEntity.setSyncFlag(NumConstant.ZERO_STR); customerGridEntity.setSyncFlag(NumConstant.ZERO_STR);
@ -299,7 +308,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
} }
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.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
customerAgencyEntity.setPid(entity.getPid().toString()); customerAgencyEntity.setPid(entity.getPid().toString());
customerAgencyEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":")); customerAgencyEntity.setPids(StringUtils.join(StringUtils.split(entity.getPids(), ","), ":"));
customerAgencyEntity.setSyncFlag(NumConstant.ZERO_STR); customerAgencyEntity.setSyncFlag(NumConstant.ZERO_STR);
@ -315,7 +323,6 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
} }
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.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
customerDepartmentEntity.setAgencyId(entity.getPid().toString()); customerDepartmentEntity.setAgencyId(entity.getPid().toString());
customerDepartmentEntity.setDepartmentName(entity.getName()); customerDepartmentEntity.setDepartmentName(entity.getName());
customerDepartmentEntity.setDepartmentDuty(entity.getName()); customerDepartmentEntity.setDepartmentDuty(entity.getName());

14
esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysUserServiceImpl.java

@ -183,18 +183,21 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
sysDeptDao.updateGridTotalUser(dto.getDeptId().toString()); sysDeptDao.updateGridTotalUser(dto.getDeptId().toString());
//同步插入customer_staff_grid //同步插入customer_staff_grid
CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity(); CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity();
gridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity, gridEntity); packageGrid(entity, gridEntity);
customerStaffGridDao.insert(gridEntity); customerStaffGridDao.insert(gridEntity);
} else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) { } else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
sysDeptDao.updateDepartmentTotalUser(dto.getDeptId().toString()); sysDeptDao.updateDepartmentTotalUser(dto.getDeptId().toString());
//同步插入customer_staff_department //同步插入customer_staff_department
CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity(); CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity();
departmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity, departmentEntity); packageDepartment(entity, departmentEntity);
customerStaffDepartmentDao.insert(departmentEntity); customerStaffDepartmentDao.insert(departmentEntity);
} else { } else {
sysDeptDao.updateAgencyTotalUser(dto.getDeptId().toString()); sysDeptDao.updateAgencyTotalUser(dto.getDeptId().toString());
//同步插入customer_staff_agency //同步插入customer_staff_agency
CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity(); CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity();
agencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity, agencyEntity); packageAgency(entity, agencyEntity);
customerStaffAgencyDao.insert(agencyEntity); customerStaffAgencyDao.insert(agencyEntity);
} }
@ -225,6 +228,8 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
//更新用户 //更新用户
updateById(entity); updateById(entity);
//查询字典获取customer_id
SysDictEntity sysDictEntity = sysDictDao.selectDcp();
//更新customer_staff //更新customer_staff
if (dto.getUserTagKey().equals("offers")) { if (dto.getUserTagKey().equals("offers")) {
QueryWrapper<CustomerStaffEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<CustomerStaffEntity> queryWrapper = new QueryWrapper<>();
@ -253,6 +258,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateGridTotalUserAfter(deptEntity); updateGridTotalUserAfter(deptEntity);
} else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) { } else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity(); CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity();
departmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity, departmentEntity); packageDepartment(entity, departmentEntity);
customerStaffDepartmentDao.insert(departmentEntity); customerStaffDepartmentDao.insert(departmentEntity);
customerStaffGridDao.deleteStaffGridById(entity.getId().toString()); customerStaffGridDao.deleteStaffGridById(entity.getId().toString());
@ -260,6 +266,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateDepartmentTotalUserAfter(deptEntity); updateDepartmentTotalUserAfter(deptEntity);
} else { } else {
CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity(); CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity();
agencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity, agencyEntity); packageAgency(entity, agencyEntity);
customerStaffAgencyDao.insert(agencyEntity); customerStaffAgencyDao.insert(agencyEntity);
customerStaffGridDao.deleteStaffGridById(entity.getId().toString()); customerStaffGridDao.deleteStaffGridById(entity.getId().toString());
@ -271,6 +278,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateDepartmentTotalUserBefore(sysDeptEntity); updateDepartmentTotalUserBefore(sysDeptEntity);
if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) { if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity(); CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity();
gridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity, gridEntity); packageGrid(entity, gridEntity);
customerStaffGridDao.insert(gridEntity); customerStaffGridDao.insert(gridEntity);
customerStaffDepartmentDao.deleteStaffDepartmentById(entity.getId().toString()); customerStaffDepartmentDao.deleteStaffDepartmentById(entity.getId().toString());
@ -282,6 +290,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateDepartmentTotalUserAfter(deptEntity); updateDepartmentTotalUserAfter(deptEntity);
} else { } else {
CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity(); CustomerStaffAgencyEntity agencyEntity = new CustomerStaffAgencyEntity();
agencyEntity.setCustomerId(sysDictEntity.getDictValue());
packageAgency(entity, agencyEntity); packageAgency(entity, agencyEntity);
customerStaffAgencyDao.insert(agencyEntity); customerStaffAgencyDao.insert(agencyEntity);
customerStaffDepartmentDao.deleteStaffDepartmentById(entity.getId().toString()); customerStaffDepartmentDao.deleteStaffDepartmentById(entity.getId().toString());
@ -293,6 +302,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateAgencyTotalUserBefore(sysDeptEntity); updateAgencyTotalUserBefore(sysDeptEntity);
if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) { if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_GRID_PARTY)) {
CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity(); CustomerStaffGridEntity gridEntity = new CustomerStaffGridEntity();
gridEntity.setCustomerId(sysDictEntity.getDictValue());
packageGrid(entity, gridEntity); packageGrid(entity, gridEntity);
customerStaffGridDao.insert(gridEntity); customerStaffGridDao.insert(gridEntity);
customerStaffAgencyDao.deleteStaffAgencyById(entity.getId().toString()); customerStaffAgencyDao.deleteStaffAgencyById(entity.getId().toString());
@ -300,6 +310,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
updateGridTotalUserAfter(deptEntity); updateGridTotalUserAfter(deptEntity);
} else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) { } else if (deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_DISTRICT_DEPT) || deptEntity.getTypeKey().equals(OrganizationTypeConstant.ORG_TYPE_STREET_DEPT)) {
CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity(); CustomerStaffDepartmentEntity departmentEntity = new CustomerStaffDepartmentEntity();
departmentEntity.setCustomerId(sysDictEntity.getDictValue());
packageDepartment(entity, departmentEntity); packageDepartment(entity, departmentEntity);
customerStaffDepartmentDao.insert(departmentEntity); customerStaffDepartmentDao.insert(departmentEntity);
customerStaffAgencyDao.deleteStaffAgencyById(entity.getId().toString()); customerStaffAgencyDao.deleteStaffAgencyById(entity.getId().toString());
@ -355,21 +366,18 @@ public class SysUserServiceImpl extends BaseServiceImpl<SysUserDao, SysUserEntit
private void packageGrid(SysUserEntity entity, CustomerStaffGridEntity gridEntity) { private void packageGrid(SysUserEntity entity, CustomerStaffGridEntity gridEntity) {
gridEntity.setId(entity.getId().toString()); gridEntity.setId(entity.getId().toString());
gridEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
gridEntity.setUserId(entity.getId().toString()); gridEntity.setUserId(entity.getId().toString());
gridEntity.setGridId(entity.getDeptId().toString()); gridEntity.setGridId(entity.getDeptId().toString());
} }
private void packageDepartment(SysUserEntity entity, CustomerStaffDepartmentEntity departmentEntity) { private void packageDepartment(SysUserEntity entity, CustomerStaffDepartmentEntity departmentEntity) {
departmentEntity.setId(entity.getId().toString()); departmentEntity.setId(entity.getId().toString());
departmentEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
departmentEntity.setUserId(entity.getId().toString()); departmentEntity.setUserId(entity.getId().toString());
departmentEntity.setDepartmentId(entity.getDeptId().toString()); departmentEntity.setDepartmentId(entity.getDeptId().toString());
} }
private void packageAgency(SysUserEntity entity, CustomerStaffAgencyEntity agencyEntity) { private void packageAgency(SysUserEntity entity, CustomerStaffAgencyEntity agencyEntity) {
agencyEntity.setId(entity.getId().toString()); agencyEntity.setId(entity.getId().toString());
agencyEntity.setCustomerId("b09527201c4409e19d1dbc5e3c3429a1");
agencyEntity.setUserId(entity.getId().toString()); agencyEntity.setUserId(entity.getId().toString());
agencyEntity.setAgencyId(entity.getDeptId().toString()); agencyEntity.setAgencyId(entity.getDeptId().toString());
} }

Loading…
Cancel
Save