|
@@ -1,39 +1,30 @@
|
|
|
package com.github.zuihou.business.controller.company;
|
|
|
|
|
|
-import cn.hutool.core.bean.BeanUtil;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.github.zuihou.authority.entity.core.Org;
|
|
|
import com.github.zuihou.authority.service.core.OrgService;
|
|
|
+import com.github.zuihou.base.R;
|
|
|
+import com.github.zuihou.base.controller.SuperController;
|
|
|
import com.github.zuihou.base.request.PageParams;
|
|
|
-import com.github.zuihou.business.company.entity.Company;
|
|
|
+import com.github.zuihou.business.company.dto.CompanyPageDTO;
|
|
|
import com.github.zuihou.business.company.dto.CompanySaveDTO;
|
|
|
import com.github.zuihou.business.company.dto.CompanyUpdateDTO;
|
|
|
-import com.github.zuihou.business.company.dto.CompanyPageDTO;
|
|
|
+import com.github.zuihou.business.company.entity.Company;
|
|
|
import com.github.zuihou.business.company.service.CompanyService;
|
|
|
-
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.stream.Collectors;
|
|
|
-
|
|
|
-import com.github.zuihou.base.controller.SuperController;
|
|
|
-import com.github.zuihou.base.R;
|
|
|
-import com.github.zuihou.database.mybatis.conditions.Wraps;
|
|
|
import com.github.zuihou.database.mybatis.conditions.query.LbqWrapper;
|
|
|
-import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
|
|
|
import com.github.zuihou.log.annotation.SysLog;
|
|
|
-import com.xxl.job.core.util.JacksonUtil;
|
|
|
+import com.github.zuihou.security.annotation.PreAuth;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.checkerframework.checker.units.qual.C;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
-import com.github.zuihou.security.annotation.PreAuth;
|
|
|
|
|
|
-import javax.ws.rs.POST;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
|
/**
|
|
@@ -83,7 +74,6 @@ public class CompanyController extends SuperController<CompanyService, Long, Com
|
|
|
@ApiOperation(value = "保存公司", notes = "保存公司")
|
|
|
@PostMapping("/saveCompany")
|
|
|
public R<Boolean> saveCompany(@RequestBody Company company) {
|
|
|
- log.info("保存企业入参" + JacksonUtil.writeValueAsString(company));
|
|
|
R<Boolean> result = baseService.saveCompany(company);
|
|
|
if(result.getIsSuccess()){
|
|
|
Org org = orgService.getOne(new LbqWrapper<Org>().eq(Org::getLabel, company.getComName()));
|