Commit e1c88436 authored by lixiaolei's avatar lixiaolei

submit

parent 0bdeda0b
...@@ -96,7 +96,7 @@ public class BusinessFileController extends BaseController { ...@@ -96,7 +96,7 @@ public class BusinessFileController extends BaseController {
// 上传并返回文件全路径 // 上传并返回文件全路径
String fileName = FileUploadUtils.upload(filePath, file); String fileName = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileName; // String url = serverConfig.getUrl() + fileName;
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put("url", fileName); ajax.put("url", fileName);
return ajax; return ajax;
......
...@@ -65,7 +65,7 @@ public class BusinessContactsServiceImpl implements IBusinessContactsService ...@@ -65,7 +65,7 @@ public class BusinessContactsServiceImpl implements IBusinessContactsService
LoginUser loginUser = SecurityUtils.getLoginUser(); LoginUser loginUser = SecurityUtils.getLoginUser();
if (ObjectUtil.isEmpty(loginUser)) throw new BaseException("请登录"); if (ObjectUtil.isEmpty(loginUser)) throw new BaseException("请登录");
//维护人员为当前登录用户 //维护人员为当前登录用户
businessContacts.setAccendant(loginUser.getUsername()); businessContacts.setAccendant(loginUser.getUser().getNickName());
return businessContactsMapper.insertBusinessContacts(businessContacts); return businessContactsMapper.insertBusinessContacts(businessContacts);
} }
......
...@@ -148,7 +148,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService { ...@@ -148,7 +148,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
row++; row++;
if (count > 0) { if (count > 0) {
//如果存在,跳过该项目,不保存 //如果存在,跳过该项目,不保存
result.add("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目,保存下一条"); // result.add("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目,保存下一条");
log.info("第" + row + "行的" + businessInfo.getProjectName() + "的项目已存在,跳过该项目,保存下一条");
errorCount++; errorCount++;
} else { } else {
//保存到数据库 //保存到数据库
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment