Merge branch 'han' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanSonServiceImpl.java

@@ -262,8 +262,8 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
         patrolInspectionRecord.setSiteType(planRecordVo.getSiteType());
         patrolInspectionRecord.setAreaName(areaList.get(0).getAreaName());
         patrolInspectionRecord.setSiteName(planRecordVo.getSiteName());
-        patrolInspectionRecord.setName(SecurityUtils.getLoginUser().getSysPerson().getFullName());
-        patrolInspectionRecord.setPhone(SecurityUtils.getLoginUser().getSysPerson().getLinkPhone());
+        patrolInspectionRecord.setName(SecurityUtils.getLoginUser().getSysUser().getNickName());
+        patrolInspectionRecord.setPhone(SecurityUtils.getLoginUser().getSysUser().getPhonenumber());
         patrolInspectionRecord.setPlanType(planSonList.get(0).getPlanType());
         patrolInspectionRecord.setSiteStatus(planRecordVo.getSiteStatus());
         patrolInspectionRecord.setLongitude(planRecordVo.getLongitude());