|
@@ -852,9 +852,16 @@ public class ProjectRecordsController extends BaseController {
|
|
|
RuralProjectRecords records = ruralProjectRecordsService.getQueryProjectUsers(reported.getProjectId());
|
|
|
|
|
|
if(StringUtils.isNotBlank(reported.getXmFZR())){
|
|
|
- User user = UserUtils.get(reported.getXmFZR());
|
|
|
- records.setProjectMasterName(user.getName());
|
|
|
- records.setProjectMasterId(user.getId());
|
|
|
+ String[] userSplit = reported.getXmFZR().split(",");
|
|
|
+ if(userSplit.length>1){
|
|
|
+ User user = UserUtils.get(userSplit[1]);
|
|
|
+ records.setProjectMasterName(user.getName());
|
|
|
+ records.setProjectMasterId(user.getId());
|
|
|
+ }else{
|
|
|
+ User user = UserUtils.get(reported.getXmFZR());
|
|
|
+ records.setProjectMasterName(user.getName());
|
|
|
+ records.setProjectMasterId(user.getId());
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
model.addAttribute("ruralProjectRecordsReported", reported);
|