|
@@ -110,6 +110,8 @@ public class YzCirculationCardController {
|
|
for (YzCirculationCardDTO y :result.getRecords()){
|
|
for (YzCirculationCardDTO y :result.getRecords()){
|
|
UserDTO userDTO2=userService.get(y.getAuthorPerson());
|
|
UserDTO userDTO2=userService.get(y.getAuthorPerson());
|
|
y.setAuthorPerson(userDTO2.getName());
|
|
y.setAuthorPerson(userDTO2.getName());
|
|
|
|
+ UserDTO userDTO1=userService.getUserByLoginName(y.getProofreader(),"10000");
|
|
|
|
+ y.setProofreader(userDTO1.getName());
|
|
}
|
|
}
|
|
return ResponseEntity.ok (result);
|
|
return ResponseEntity.ok (result);
|
|
}
|
|
}
|
|
@@ -122,12 +124,15 @@ public class YzCirculationCardController {
|
|
@ApiOperation(value = "根据Id获取拟稿申请数据")
|
|
@ApiOperation(value = "根据Id获取拟稿申请数据")
|
|
// @PreAuthorize("hasAnyAuthority('yzcirculation:yzCirculationCard:view','yzcirculation:yzCirculationCard:add','yzcirculation:yzCirculationCard:edit')")
|
|
// @PreAuthorize("hasAnyAuthority('yzcirculation:yzCirculationCard:view','yzcirculation:yzCirculationCard:add','yzcirculation:yzCirculationCard:edit')")
|
|
@GetMapping("queryById")
|
|
@GetMapping("queryById")
|
|
- public ResponseEntity<YzCirculationCardDTO> queryById(String id) {
|
|
|
|
|
|
+ public ResponseEntity<YzCirculationCardDTO> queryById(String id,Integer type) {
|
|
YzCirculationCardDTO yzCirculationCardDTO = yzCirculationCardWrapper.toDTO(yzCirculationCardService.getById ( id )) ;
|
|
YzCirculationCardDTO yzCirculationCardDTO = yzCirculationCardWrapper.toDTO(yzCirculationCardService.getById ( id )) ;
|
|
UserDTO userDTO2=userService.get(yzCirculationCardDTO.getAuthorPerson());
|
|
UserDTO userDTO2=userService.get(yzCirculationCardDTO.getAuthorPerson());
|
|
|
|
+ yzCirculationCardDTO.setAuthorId(yzCirculationCardDTO.getAuthorPerson());
|
|
yzCirculationCardDTO.setAuthorPerson(userDTO2.getName());
|
|
yzCirculationCardDTO.setAuthorPerson(userDTO2.getName());
|
|
- UserDTO userDTO=userService.getUserByLoginName(yzCirculationCardDTO.getProofreader(),"10000");
|
|
|
|
- yzCirculationCardDTO.setProofreader(userDTO.getName());
|
|
|
|
|
|
+ if(type!=null && type==1) {
|
|
|
|
+ UserDTO userDTO=userService.getUserByLoginName(yzCirculationCardDTO.getProofreader(),"10000");
|
|
|
|
+ yzCirculationCardDTO.setProofreader(userDTO.getName());
|
|
|
|
+ }
|
|
return ResponseEntity.ok ( yzCirculationCardDTO);
|
|
return ResponseEntity.ok ( yzCirculationCardDTO);
|
|
}
|
|
}
|
|
|
|
|