cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug

dev
zhanglei 2026-07-09 09:52:18 +08:00
parent f4ede78d8d
commit 0036bd64e1
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgDepartmentExecutor.java
View File

@ -58,14 +58,27 @@ public class OrgDepartmentExecutor implements OrgDepartmentApi {
@Override @Override
public SingleResponse<OrgDepartmentCO> modify(OrgDepartmentModifyCmd cmd) { public SingleResponse<OrgDepartmentCO> modify(OrgDepartmentModifyCmd cmd) {
OrgDepartmentEntity entity = new OrgDepartmentEntity(); OrgDepartmentEntity entity = new OrgDepartmentEntity();
entity.setId(cmd.getId() != null ? Long.parseLong(cmd.getId()) : null); if (cmd.getId() != null) {
entity.setParentId(cmd.getParentId() != null ? Long.parseLong(cmd.getParentId()) : null); entity.setId(Long.parseLong(cmd.getId()));
entity.setDeptName(cmd.getDeptName()); }
entity.setManagerName(cmd.getManagerName()); if (entity.getParentId() != null) {
entity.setManagerAccount(cmd.getManagerAccount()); entity.setParentId(Long.parseLong(cmd.getParentId()));
entity.setDeptLevelCode(cmd.getDeptLevelCode()); }
entity.setDeptLevelName(cmd.getDeptLevelName()); 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); OrgDepartmentEntity result = orgDepartmentDomainService.modify(entity);
return SingleResponse.success(toCO(result)); return SingleResponse.success(toCO(result));
} }

2
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgDepartmentGatewayImpl.java
View File

@ -98,7 +98,7 @@ public class OrgDepartmentGatewayImpl implements OrgDepartmentGateway {
private OrgDepartmentDO toDO(OrgDepartmentEntity entity) { private OrgDepartmentDO toDO(OrgDepartmentEntity entity) {
OrgDepartmentDO dataObject = new OrgDepartmentDO(); OrgDepartmentDO dataObject = new OrgDepartmentDO();
dataObject.setOrgId(orgContextResolver.resolveOrgId(entity.getOrgId())); dataObject.setOrgId(orgContextResolver.resolveOrgId(entity.getOrgId()));
dataObject.setParentId(entity.getParentId() != null ? entity.getParentId() : 0L); dataObject.setParentId(entity.getParentId());
dataObject.setDeptName(entity.getDeptName()); dataObject.setDeptName(entity.getDeptName());
dataObject.setManagerName(entity.getManagerName()); dataObject.setManagerName(entity.getManagerName());
dataObject.setManagerAccount(entity.getManagerAccount()); dataObject.setManagerAccount(entity.getManagerAccount());