单位管理修改

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/CompanyInfoVO.java

@@ -31,7 +31,6 @@ public class CompanyInfoVO implements Serializable {
     @NotNull(message = "单位名称不能为空", groups = { Insert.class })
     private String companyName;
     @ApiModelProperty(value = "单位全称", example = "浙江科比特创新科技有限公司")
-    @NotNull(message = "单位全称不能为空", groups = { Insert.class })
     private String fullName;
     @ApiModelProperty(value = "省份名称", example = "广东省")
     @NotNull(message = "省份名称不能为空", groups = { Insert.class })

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/client/PmsClient.java

@@ -27,7 +27,7 @@ public class PmsClient {
         HttpHeaders headers = new HttpHeaders();
         headers.add("token", token);
         HttpEntity<String> entity = new HttpEntity<>(null, headers);
-        ResponseEntity<ResultBody> responseEntity = restTemplate.exchange(pmsAppUri+"/pms/backstage/work/queryWorkServiceCount" + "?id=" + id, HttpMethod.GET, entity, ResultBody.class);
+        ResponseEntity<ResultBody> responseEntity = restTemplate.exchange(pmsAppUri+"/pms/backstage/work/queryWorkServiceCount" + "?companyId=" + id, HttpMethod.GET, entity, ResultBody.class);
         ResultBody body = responseEntity.getBody();
         if (body.getCode().equals(ResultEnum.SUCCESS.getResultCode())){
             Integer count = (Integer) body.getResult();

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/CompanyController.java

 package com.mmc.iuav.user.controller;
 
+import com.mmc.iuav.group.Insert;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.qo.CompanyInfoQO;
 import com.mmc.iuav.user.model.vo.CompanyInfoVO;
@@ -9,6 +10,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -25,7 +27,7 @@ public class CompanyController extends BaseController{
     @ApiOperation(value = "新增")
     @ApiResponses({ @ApiResponse(code = 200, message = "OK", response = ResultBody.class) })
     @PostMapping("add")
-    public ResultBody add(@RequestBody CompanyInfoVO companyInfo){
+    public ResultBody add(@Validated(Insert.class) @RequestBody CompanyInfoVO companyInfo){
         return companyService.addCompanyInfo(companyInfo);
     }