Browse Source

1、增加组织坐标返回;

master
luyan 1 year ago
parent
commit
553dacd256
  1. 2
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java
  2. 6
      esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java
  3. 2
      esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

2
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysDeptDTO.java

@ -15,6 +15,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
@ -29,6 +30,7 @@ import java.util.Date;
* @author Mark sunlightcs@gmail.com * @author Mark sunlightcs@gmail.com
* @since 1.0.0 * @since 1.0.0
*/ */
@Data
@ApiModel(value = "部门管理") @ApiModel(value = "部门管理")
public class SysDeptDTO extends TreeNode implements Serializable { public class SysDeptDTO extends TreeNode implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;

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

@ -1724,8 +1724,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
@Override @Override
public SysDeptDTO getDeptInfo(CityCenterFromDTO formDTO) { public SysDeptDTO getDeptInfo(CityCenterFromDTO formDTO) {
SysDeptDTO deptDTO = baseDao.selectDeptInfo(formDTO);
log.info("deptDTO:{}",deptDTO.toString());
return baseDao.selectDeptInfo(formDTO); return deptDTO;
} }
} }

2
esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@ -1697,6 +1697,7 @@ public class AppUserServiceImpl implements AppUserService {
if (dto.getDeptId() != null) { if (dto.getDeptId() != null) {
formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 2])); formDTO.setDeptId(Long.parseLong(dto.getAllDeptIds()[dto.getAllDeptIds().length - 2]));
SysDeptDTO liveDept = adminFeignClient.getDeptInfo(formDTO).getData(); SysDeptDTO liveDept = adminFeignClient.getDeptInfo(formDTO).getData();
log.info("liveDept:{}",liveDept.toString());
partyMemberRegistDTO.setLiveAddress(liveDept.getAddress()); partyMemberRegistDTO.setLiveAddress(liveDept.getAddress());
partyMemberRegistDTO.setLiveCommunity(liveDept.getName()); partyMemberRegistDTO.setLiveCommunity(liveDept.getName());
partyMemberRegistDTO.setLiveMobile(liveDept.getMobile()); partyMemberRegistDTO.setLiveMobile(liveDept.getMobile());
@ -1709,6 +1710,7 @@ public class AppUserServiceImpl implements AppUserService {
if (null != dto.getCouplingCommunity()) { if (null != dto.getCouplingCommunity()) {
formDTO.setDeptId(Long.parseLong(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 2])); formDTO.setDeptId(Long.parseLong(dto.getCouplingCommunity()[dto.getCouplingCommunity().length - 2]));
SysDeptDTO couplingDept = adminFeignClient.getDeptInfo(formDTO).getData(); SysDeptDTO couplingDept = adminFeignClient.getDeptInfo(formDTO).getData();
log.info("couplingDept:{}",couplingDept.toString());
partyMemberRegistDTO.setCouplingAddress(couplingDept.getAddress()); partyMemberRegistDTO.setCouplingAddress(couplingDept.getAddress());
partyMemberRegistDTO.setCouplingCommunity(couplingDept.getName()); partyMemberRegistDTO.setCouplingCommunity(couplingDept.getName());
partyMemberRegistDTO.setCouplingMobile(couplingDept.getMobile()); partyMemberRegistDTO.setCouplingMobile(couplingDept.getMobile());

Loading…
Cancel
Save