From b97306686e7ac770ba7626dda6835838bdc9fc77 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 19 十二月 2024 15:38:44 +0800 Subject: [PATCH] cnas:1.添加检验下单审核通过后新增7.1检验委托单+2.添加报告编制批准通过后新增7.4报告结果+3.用户控制层一些常用的方法 --- user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java index ca5d2d6..09bb019 100644 --- a/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java +++ b/user-server/src/main/java/com/yuanchu/mom/controller/CompaniesController.java @@ -23,7 +23,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; @RestController @AllArgsConstructor @@ -43,13 +42,13 @@ @ValueClassify("鐢ㄦ埛绠$悊") @PostMapping("/getSampleUser") - @ApiOperation(value = "鐩存帴鑾峰彇涓庤嚜宸辩浉鍚屽崟浣嶇殑浜哄憳鍒楄〃") + @ApiOperation(value = "鏌ョ湅鎸囧畾閮ㄩ棬鐨勪汉浜嬬郴缁熺粍缁囨灦鏋�") public Result<?> getSampleUser(){ return Result.success(); } @ValueClassify("鐢ㄦ埛绠$悊") - @ApiOperation(value = "鑾峰彇浜轰簨绯荤粺缁勭粐鏋舵瀯") + @ApiOperation(value = "鏌ョ湅浜轰簨绯荤粺缁勭粐鏋舵瀯") @GetMapping(value = "/selectCompaniesList") public Result<List<Company>> selectCompaniesList() { //鍒ゆ柇鏄惁鏈夌洿鎺ヨ幏鍙栫涓夋柟閮ㄩ棬鐨勬潈闄� @@ -60,10 +59,10 @@ if (ObjectUtils.isNotEmpty(power)){ List<Company> companies = new ArrayList<>(); Company company = new Company(); - if (ObjectUtils.isEmpty(user.getCompanyId())){ + if (ObjectUtils.isEmpty(user.getCompany())){ throw new ErrorException("璇ョ敤鎴锋病鏈夋墍灞炲崟浣�!"); } - company.setCompanyId(user.getCompanyId()); + company.setCompanyId(user.getCompany()); companies.add(company); return Result.success(companies); }else { -- Gitblit v1.9.3