Commit 483457d9 authored by 钱义海's avatar 钱义海

添加专家推荐

parent 18af65ed
...@@ -119,11 +119,14 @@ public class ComExpertController extends BaseController<ComExpertService, ComExp ...@@ -119,11 +119,14 @@ public class ComExpertController extends BaseController<ComExpertService, ComExp
private void checkRole(@RequestBody @Validated ComExpertDTO dto) { private void checkRole(@RequestBody @Validated ComExpertDTO dto) {
if (SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.unit.getCode().toString())) { if (SecurityUserHolder.getRoles().contains(CommonEnum.systemRole.unit.getCode().toString())) {
dto.setUnitId(SecurityUserHolder.getUnitId()); dto.setUnitId(SecurityUserHolder.getUnitId());
ComUnitDTO comUnitDTO = comUnitService.getUnitById(SecurityUserHolder.getUnitId());
dto.setUnitName(comUnitDTO.getUnitName());
} else { } else {
if (Objects.nonNull(dto.getTreeCode())) { if (Objects.nonNull(dto.getTreeCode())) {
ComUnitDTO unit = comUnitService.getByTreeCode(dto.getTreeCode()); ComUnitDTO unit = comUnitService.getByTreeCode(dto.getTreeCode());
if (null != unit) { if (null != unit) {
dto.setUnitId(unit.getId()); dto.setUnitId(unit.getId());
dto.setUnitName(unit.getUnitName());
} }
} }
} }
......
...@@ -167,6 +167,9 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper ...@@ -167,6 +167,9 @@ public class ComExpertServiceImpl extends BaseServiceImpl<ComExpertDAO, ComExper
comExpert = new ComExpert(); comExpert = new ComExpert();
comExpert.setId(dto.getId()); comExpert.setId(dto.getId());
comExpert.setRemark(dto.getRemark()); comExpert.setRemark(dto.getRemark());
if(dto.getReportState()!=null){
comExpert.setReportState(dto.getReportState());
}
this.update(comExpert); this.update(comExpert);
comPersonService.updateById(comPerson); comPersonService.updateById(comPerson);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment