Merge remote-tracking branch 'origin/master'

mec-web/src/main/java/com/ym/mec/web/controller/education/EduRepairController.java

@@ -22,6 +22,7 @@ import com.ym.mec.common.page.QueryInfo;
 import com.ym.mec.util.date.DateUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
@@ -106,6 +107,12 @@ public class EduRepairController extends BaseController {
         }
         repairInfo.setEmployeeId(sysUser.getId());
         repairInfo.setEmployeeName(sysUser.getRealName());
+        if(repairInfo.getSendType().equals(1)){
+            Employee employee = employeeDao.get(sysUser.getId());
+            if(StringUtils.isBlank(employee.getContactAddress())){
+                return failed("联系地址为空,请联系相关人员在\"员工管理\"完善");
+            }
+        }
         return succeed(studentRepairService.addRepair(repairInfo));
     }