bug
parent
f4ede78d8d
commit
0036bd64e1
|
|
@ -58,14 +58,27 @@ public class OrgDepartmentExecutor implements OrgDepartmentApi {
|
|||
@Override
|
||||
public SingleResponse<OrgDepartmentCO> modify(OrgDepartmentModifyCmd cmd) {
|
||||
OrgDepartmentEntity entity = new OrgDepartmentEntity();
|
||||
entity.setId(cmd.getId() != null ? Long.parseLong(cmd.getId()) : null);
|
||||
entity.setParentId(cmd.getParentId() != null ? Long.parseLong(cmd.getParentId()) : null);
|
||||
if (cmd.getId() != null) {
|
||||
entity.setId(Long.parseLong(cmd.getId()));
|
||||
}
|
||||
if (entity.getParentId() != null) {
|
||||
entity.setParentId(Long.parseLong(cmd.getParentId()));
|
||||
}
|
||||
if(cmd.getDeptName() != null) {
|
||||
entity.setDeptName(cmd.getDeptName());
|
||||
}
|
||||
if (cmd.getManagerName() != null) {
|
||||
entity.setManagerName(cmd.getManagerName());
|
||||
}
|
||||
if (cmd.getManagerAccount() != null) {
|
||||
entity.setManagerAccount(cmd.getManagerAccount());
|
||||
}
|
||||
if (cmd.getDeptLevelCode() != null) {
|
||||
entity.setDeptLevelCode(cmd.getDeptLevelCode());
|
||||
}
|
||||
if (cmd.getDeptLevelName() != null) {
|
||||
entity.setDeptLevelName(cmd.getDeptLevelName());
|
||||
|
||||
}
|
||||
OrgDepartmentEntity result = orgDepartmentDomainService.modify(entity);
|
||||
return SingleResponse.success(toCO(result));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -98,7 +98,7 @@ public class OrgDepartmentGatewayImpl implements OrgDepartmentGateway {
|
|||
private OrgDepartmentDO toDO(OrgDepartmentEntity entity) {
|
||||
OrgDepartmentDO dataObject = new OrgDepartmentDO();
|
||||
dataObject.setOrgId(orgContextResolver.resolveOrgId(entity.getOrgId()));
|
||||
dataObject.setParentId(entity.getParentId() != null ? entity.getParentId() : 0L);
|
||||
dataObject.setParentId(entity.getParentId());
|
||||
dataObject.setDeptName(entity.getDeptName());
|
||||
dataObject.setManagerName(entity.getManagerName());
|
||||
dataObject.setManagerAccount(entity.getManagerAccount());
|
||||
|
|
|
|||
Loading…
Reference in New Issue