4.9修改公司接口

src/main/java/com/example/tdl/domain/vo/UpdateCompanyVo.java

@@ -3,8 +3,6 @@ package com.example.tdl.domain.vo;
 public class UpdateCompanyVo {
     private String companyNo;
 
-    private String oldCompanyName;
-
     private String companyName;
 
     private String country;
@@ -17,14 +15,6 @@ public class UpdateCompanyVo {
 
     private String manager;
 
-    public String getOldCompanyName() {
-        return oldCompanyName;
-    }
-
-    public void setOldCompanyName(String oldCompanyName) {
-        this.oldCompanyName = oldCompanyName;
-    }
-
     public String getCompanyNo() {
         return companyNo;
     }

src/main/java/com/example/tdl/web/CompanyController.java

@@ -139,7 +139,6 @@ public class CompanyController {
     //修改公司信息
     @ApiOperation(value = "修改公司信息",notes = "修改公司信息，需要传的值：" +
             "   companyNo:需要修改的公司编号，" +
-            "   oldCompanyName:需要修改的公司名，" +
             "   companyName:修改后的公司名，" +
             "   country:国家，" +
             "   city:城市，" +
@@ -156,11 +155,6 @@ public class CompanyController {
             fb.setMessage("需要修改的公司的公司编号");
             return gson.toJson(fb);
         }
-        if (StringUtils.isEmpty(updateCompanyVo.getOldCompanyName())){
-            fb.setCode(0);
-            fb.setMessage("修改之前的公司名");
-            return gson.toJson(fb);
-        }
         if (StringUtils.isEmpty(updateCompanyVo.getCompanyName())){
             fb.setCode(0);
             fb.setMessage("修改的公司名");
@@ -196,7 +190,7 @@ public class CompanyController {
             fb.setMessage("手机号不规范");
             return gson.toJson(fb);
         }
-        if (companyService.getByCompanyName(updateCompanyVo.getCompanyName())!=null&&!updateCompanyVo.getOldCompanyName().equals(updateCompanyVo.getCompanyName())){
+        if (companyService.getByCompanyName(updateCompanyVo.getCompanyName())!=null&&!companyService.getByCompanyNo(updateCompanyVo.getCompanyNo()).getCompanyName().equals(updateCompanyVo.getCompanyName())){
             fb.setCode(0);
             fb.setMessage("修改的公司名不能重复");
             return gson.toJson(fb);