..

src/main/java/io/renren/modules/admin/controller/MeetingController.java

@@ -6,11 +6,13 @@ import io.renren.modules.admin.entity.IndustryEntity;
import io.renren.modules.admin.entity.MeetingEntity;
import io.renren.modules.admin.entity.SubjectEntity;
import io.renren.modules.admin.entity.TypesOfAttendersEntity;
import io.renren.modules.admin.entity.EmployeeEntity;
import io.renren.modules.admin.form.MeetingForm;
import io.renren.modules.admin.service.IndustryService;
import io.renren.modules.admin.service.MeetingService;
import io.renren.modules.admin.service.SubjectService;
import io.renren.modules.admin.service.TypesOfAttendersService;
import io.renren.modules.admin.service.EmployeeService;
import org.apache.commons.lang.StringUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -49,7 +51,8 @@ public class MeetingController {
    @Autowired
    private TypesOfAttendersService typesOfAttendersService;
@Autowired
    private EmployeeService employeeService;
    /**
     * 列表
     */
@@ -82,7 +85,14 @@ public class MeetingController {
    @RequiresPermissions("admin:meeting:info")
    public R info(@PathVariable("id") Long id){
		MeetingEntity meeting = meetingService.getById(id);
        Long sId = meeting.getServiceId();
        if (sId == null || sId == 0) {
              meeting.setServiceName("");
        } else{
            EmployeeEntity employee = employeeService.getById(sId);
            meeting.setServiceName(employee.getTruename());
        }
        
        return R.ok().put("meeting", meeting);
    }