feat: 优化模版导入

src/main/java/cn/ezhizao/common/utils/poi/ExcelUtil.java

@@ -391,6 +391,10 @@ public class ExcelUtil<T>
                     else if (BigDecimal.class == fieldType)
                     {
                         val = Convert.toBigDecimal(val);
+                        if (Objects.nonNull(val) && (attr.scale() != -1)) {
+                            val = ((BigDecimal) val).setScale(attr.scale(), attr.roundingMode());
+                        }
+
                     }
                     else if (Date.class == fieldType)
                     {

src/main/java/cn/ezhizao/project/business/company/controller/BizCompanyController.java

@@ -15,8 +15,11 @@ import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import cn.ezhizao.project.business.channel.domain.BizChannel;
 import cn.ezhizao.project.business.channel.service.IBizChannelService;
 import cn.ezhizao.project.business.company.domain.BizCompanyImport;
+import cn.ezhizao.project.business.company.domain.BizEntrustTemplate;
 import cn.ezhizao.project.business.company.domain.DictRegion;
+import cn.ezhizao.project.business.company.domain.vo.ExportZero;
 import cn.ezhizao.project.business.company.domain.vo.Region;
+import cn.ezhizao.project.business.company.domain.vo.ZeroTemplate;
 import cn.ezhizao.project.business.company.service.IDictRegionService;
 import cn.ezhizao.project.business.company.service.impl.BizCompanyServiceImpl;
 import cn.ezhizao.project.business.companyContactor.domain.BizCompanyContactor;
@@ -31,6 +34,7 @@ import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.schema.ArraySchema;
 import org.apache.commons.io.IOUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -122,7 +126,16 @@ public class BizCompanyController extends BaseController
         String message = bizCompanyService.importCompany(companyList, operName, getTenantId() == null ? 0 : getTenantId());
         return success(message);
     }
+    @PostMapping("/importZero")
+    public AjaxResult importZero(MultipartFile file) throws Exception
+    {
+        Long tenantId = getTenantId();
+        ExcelUtil<ExportZero> util = new ExcelUtil<>(ExportZero.class);
+        List<ExportZero> companyList = util.importExcel(file.getInputStream());
+        String message = bizCompanyService.importZero(companyList,getTenantId() == null ? 0 : getTenantId());
 
+        return success(message);
+    }
     public  List<String> getExcelAnnotatedFields(Class<?> clazz) {
         Field[] fields = clazz.getDeclaredFields();
         List<String> result = new ArrayList<>();
@@ -222,7 +235,19 @@ public class BizCompanyController extends BaseController
         ExcelUtil<BizCompany> util = new ExcelUtil<>(BizCompany.class);
         util.importTemplateExcel(response, "客户数据", StringUtils.EMPTY, new String[]{"name", "sourceCategoryName", "sourceName","leaderName","adviserName"});
     }
+    @PostMapping("/importTemplateEntrust")
+    public void importTemplateEntrust(HttpServletResponse response)
+    {
+        ExcelUtil<BizEntrustTemplate> util = new ExcelUtil<>(BizEntrustTemplate.class);
+        util.importTemplateExcel(response, "委托数据", StringUtils.EMPTY);
+    }
 
+    @PostMapping("/importTemplateIsZero")
+    public void importTemplateIsZero(HttpServletResponse response)
+    {
+        ExcelUtil<ZeroTemplate> util = new ExcelUtil<>(ZeroTemplate.class);
+        util.importTemplateExcel(response, "客户数据", StringUtils.EMPTY);
+    }
     //设置客服
     @PostMapping("/setCompanyAdviser")
     @PreAuthorize("@ss.hasPermi('business:company:adviser')")

src/main/java/cn/ezhizao/project/business/company/domain/BizCompany.java

@@ -377,4 +377,7 @@ public class BizCompany extends BaseEntity
 
     @TableField(exist = false)
     private String keyword;
+
+    @TableField(exist = false)
+    private String principal;
 }

src/main/java/cn/ezhizao/project/business/company/domain/BizEntrustTemplate.java

@@ -0,0 +1,19 @@
+package cn.ezhizao.project.business.company.domain;
+
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class BizEntrustTemplate {
+    @Excel(name = "受委托方")
+    private String toEntrustName;
+    @Excel(name = "客户名称")
+    private String companyName;
+    @Excel(name = "报税")
+    private String taskName1;
+    @Excel(name = "社保")
+    private String taskName2;
+    @Excel(name = "公积金")
+    private String taskName3;
+}

src/main/java/cn/ezhizao/project/business/company/domain/vo/ExportZero.java

@@ -0,0 +1,17 @@
+package cn.ezhizao.project.business.company.domain.vo;
+
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class ExportZero {
+    private static final long serialVersionUID = 1L;
+    /** 客户编码 */
+    @Excel(name = "客户名称")
+    private String name;
+
+    /** 客户编码 */
+    @Excel(name = "是否零申报")
+    private String isZero;
+}

src/main/java/cn/ezhizao/project/business/company/domain/vo/ZeroTemplate.java

@@ -0,0 +1,13 @@
+package cn.ezhizao.project.business.company.domain.vo;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import lombok.Data;
+
+@Data
+public class ZeroTemplate {
+    @Excel(name = "客户名称")
+    private String name;
+    @Excel(name = "是否零申报")
+    private String isZero;
+}
+

src/main/java/cn/ezhizao/project/business/company/service/IBizCompanyService.java

@@ -1,6 +1,7 @@
 package cn.ezhizao.project.business.company.service;
 
 import cn.ezhizao.project.business.company.domain.BizCompany;
+import cn.ezhizao.project.business.company.domain.vo.ExportZero;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import java.util.List;
@@ -35,4 +36,6 @@ public interface IBizCompanyService extends IService<BizCompany>
     public int physicalDelete(BizCompany bizCompany);
 
     String importCompany(List<BizCompany> companyList, String operName, Long tenantId);
+
+    String importZero(List<ExportZero> companyList, long l);
 }

src/main/java/cn/ezhizao/project/business/company/service/impl/BizCompanyServiceImpl.java

@@ -3,10 +3,12 @@ package cn.ezhizao.project.business.company.service.impl;
 import cn.ezhizao.common.constant.HttpStatus;
 import cn.ezhizao.common.exception.ServiceException;
 import cn.ezhizao.common.utils.StringUtils;
+import cn.ezhizao.common.utils.bean.BeanUtils;
 import cn.ezhizao.common.utils.bean.BeanValidators;
 import cn.ezhizao.project.business.channel.domain.BizChannel;
 import cn.ezhizao.project.business.channel.mapper.BizChannelMapper;
 import cn.ezhizao.project.business.company.domain.BizCompany;
+import cn.ezhizao.project.business.company.domain.vo.ExportZero;
 import cn.ezhizao.project.business.company.mapper.BizCompanyMapper;
 import cn.ezhizao.project.business.company.service.IBizCompanyService;
 import cn.ezhizao.project.business.companyContactor.domain.BizCompanyContactor;
@@ -17,14 +19,19 @@ import cn.ezhizao.project.business.settings.domain.BizSource;
 import cn.ezhizao.project.business.settings.mapper.BizSourceMapper;
 import cn.ezhizao.project.system.domain.SysUser;
 import cn.ezhizao.project.system.mapper.SysUserMapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import javax.validation.Validator;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
 
 /**
  * companyService业务层处理
@@ -185,6 +192,57 @@ public class BizCompanyServiceImpl  extends ServiceImpl<BizCompanyMapper, BizCom
 //        return "";
     }
 
+    @Override
+    public String importZero(List<ExportZero> companyList, long tenantId) {
+        StringBuilder successMsg = new StringBuilder();
+        int successNum = 0;
+        int failureNum = 0;
+        StringBuilder failureMsg = new StringBuilder();
+        List<String> name = bizCompanyMapper.selectList(new LambdaQueryWrapper<BizCompany>()
+                .eq(BizCompany::getTenantId, tenantId)
+        ).stream().map(m ->m.getName()).collect(Collectors.toList());
+        for (ExportZero zero : companyList) {
+            try {
+               if (!name.contains(zero.getName())){
+                   throw new Exception("不存在");
+               }
+            }catch (Exception e){
+                failureNum++;
+                String msg = "<br/>" + failureNum + "、客户 " + zero.getName() ;
+                failureMsg.append(msg + e.getMessage());
+                log.error(msg, e);
+            }
+        }
+        List<BizCompany> bizCompanyList = companyList.stream().map(m -> {
+                    BizCompany bizCompany = new BizCompany();
+                    bizCompany.setName(m.getName());
+                    bizCompany.setIsZero(m.getIsZero().equals("零申报") ? 1 : 0);
+                    bizCompany.setTenantId(tenantId);
+                    return bizCompany;
+                }
+        ).collect(Collectors.toList());
+        List<BizCompany> list= this.list(new LambdaQueryWrapper<BizCompany>().eq(BizCompany::getTenantId, tenantId));
+        for (BizCompany bizCompany : bizCompanyList) {
+            for (BizCompany company : list) {
+               if(bizCompany.getName().trim().equals(company.getName().trim())) {
+                   bizCompany.setId(company.getId());
+               }
+            }
+        }
+        this.updateBatchById(bizCompanyList);
+        if (failureNum > 0)
+        {
+            failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
+            throw new ServiceException(failureMsg.toString());
+        }
+        else
+        {
+            successMsg.insert(0, "恭喜您，数据已全部导入成功！");
+        }
+//        successMsg.append("零申报非零申报客户导入成功");
+        return successMsg.toString();
+    }
+
     ;
 
     @Override
@@ -203,7 +261,10 @@ public class BizCompanyServiceImpl  extends ServiceImpl<BizCompanyMapper, BizCom
     }
     @Override
     public boolean updateById(BizCompany company) {
-        if(this.query().eq("name", company.getName()).ne("id", company.getId() == null ? 0L :company.getId()).count() > 0) throw new ServiceException("客户名称重复", HttpStatus.ERROR);
+        if(this.query()
+                .eq("tenant_id",company.getTenantId())
+                .eq("name", company.getName())
+                .ne("id", company.getId() == null ? 0L :company.getId()).count() > 0) throw new ServiceException("客户名称重复", HttpStatus.ERROR);
         AtomicBoolean res = new AtomicBoolean(super.updateById(company));
         BizCompanyContactor delCondition = new BizCompanyContactor();
         delCondition.setCompanyId(company.getId());

src/main/java/cn/ezhizao/project/business/order/controller/BizArchiveInputController.java

@@ -317,6 +317,7 @@ public class BizArchiveInputController extends BaseController {
     @Log(title = "合同导入", businessType = BusinessType.IMPORT)
     @PreAuthorize("@ss.hasPermi('business:archive:order:import')")
     @PostMapping("/importLoop")
+    @Transactional
     public AjaxResult importLoop(MultipartFile file) throws Exception {
         ExcelUtil<OrderExcelImportLoopModel> util = new ExcelUtil<>(OrderExcelImportLoopModel.class);
         List<OrderExcelImportLoopModel> orderList = util.importExcel(file.getInputStream());

src/main/java/cn/ezhizao/project/business/order/domain/OrderExcelImportLoopModel.java

@@ -2,11 +2,13 @@ package cn.ezhizao.project.business.order.domain;
 
 import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
 import lombok.Data;
+import lombok.ToString;
 
 import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
+@ToString
 public class OrderExcelImportLoopModel {
     //    合同编号
     @Excel(name = "合同编号")
@@ -33,20 +35,20 @@ public class OrderExcelImportLoopModel {
     @Excel(name = "备注")
     private String remark;
     //    服务金额
-    @Excel(name = "服务金额")
+    @Excel(name = "服务金额", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal amount;
     //    优惠金额
-    @Excel(name = "优惠金额")
+    @Excel(name = "优惠金额", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal discountAmount;
     //    实收金额
-    @Excel(name = "实收金额")
+    @Excel(name = "实收金额", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal trueAmount;
 
     // 代理记账
     @Excel(name = "代理记账")
     private String keepAccount;
     // 代理记账单价
-    @Excel(name = "代理记账单价")
+    @Excel(name = "代理记账单价", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal keepAccountPrice;
     // 记账服务月数
     @Excel(name = "记账服务月数")
@@ -59,13 +61,13 @@ public class OrderExcelImportLoopModel {
     @Excel(name ="记账结束月")
     private Date keepAccountEndMonth;
     // 记账总金额
-    @Excel(name = "记账总金额")
+    @Excel(name = "记账总金额", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal keepAccountAmount;
     // 社保代缴
     @Excel(name = "社保代缴")
     private String socialSecurity;
     // 社保单价
-    @Excel(name = "社保单价")
+    @Excel(name = "社保单价", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal socialSecurityPrice;
     // 社保服务月数
     @Excel(name = "社保服务月数")
@@ -78,13 +80,13 @@ public class OrderExcelImportLoopModel {
     @Excel(name ="社保结束月")
     private Date socialSecurityEndMonth;
     // 社保总金额
-    @Excel(name = "社保总金额")
+    @Excel(name = "社保总金额", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal socialSecurityAmount;
     // 公积金代缴
     @Excel(name = "公积金代缴")
     private String housingFund;
     // 公积金单价
-    @Excel(name = "公积金单价")
+    @Excel(name = "公积金单价", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal housingFundPrice;
     // 公积金服务月数
     @Excel(name = "公积金服务月数")
@@ -97,7 +99,7 @@ public class OrderExcelImportLoopModel {
     @Excel(name ="公积金结束月")
     private Date housingFundEndMonth;
     // 公积金总金额
-    @Excel(name = "公积金总金额")
+    @Excel(name = "公积金总金额", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal housingFundAmount;
     // 返税申报
     @Excel(name = "返税申报")
@@ -116,7 +118,7 @@ public class OrderExcelImportLoopModel {
     @Excel(name ="返税结束月")
     private Date returnTaxEndMonth;
     // 返税总金额
-    @Excel(name= "返税总金额")
+    @Excel(name= "返税总金额", scale = 2, roundingMode = BigDecimal.ROUND_HALF_UP)
     private BigDecimal returnTaxAmount;
 
 }

src/main/java/cn/ezhizao/project/business/order/service/impl/BizArchiveInputServiceImpl.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import javax.annotation.Resource;
 
 import cn.ezhizao.common.constant.HttpStatus;
@@ -349,7 +350,10 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
     @Override
     public boolean updateById(BizArchiveInput bizArchiveInput) {
         // 判断是否重复订单号
-        if(this.query().eq("contract_no", bizArchiveInput.getContractNo()).eq("from_id", 0L).ne("id", bizArchiveInput.getId() == null ? 0L :bizArchiveInput.getId()).count() > 0) throw new ServiceException("订单号不能重复", HttpStatus.ERROR);
+        if(this.query()
+                .eq("contract_no", bizArchiveInput.getContractNo())
+                .eq("tenant_id",bizArchiveInput.getTenantId())
+                .eq("from_id", 0L).ne("id", bizArchiveInput.getId() == null ? 0L :bizArchiveInput.getId()).count() > 0) throw new ServiceException("订单号不能重复", HttpStatus.ERROR);
 
         boolean saveStatus = super.updateById(bizArchiveInput);
         List<BizArchiveInputDetail> bizArchiveInputDetails = bizArchiveInput.getDetails();
@@ -654,6 +658,10 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
         if (StringUtils.isNull(orderList) || orderList.size() == 0) {
             throw new ServiceException("导入数据不能为空！");
         }
+        List<String> contractNo = orderList.stream().map(m -> m.getContractNo()).collect(Collectors.toList());
+        //合同号不能重复
+        Map<String, Long> nameCountMap = contractNo.stream()
+                .collect(Collectors.groupingBy(name -> name, Collectors.counting()));
         List<BizArchiveInput> archiveInputs = new ArrayList<>();
         List<BizWorkOrder> bizWorkOrders = new ArrayList<>();
         List<BizWorkOrderDetail> bizWorkOrderDetails = new ArrayList<>();
@@ -666,6 +674,7 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
+        List<String> contNOs = this.query().eq("service_type", 1).eq("tenant_id", tenantId).list().stream().map(m -> m.getContractNo()).collect(Collectors.toList());
         for (OrderExcelImportLoopModel item : orderList) {
             BizArchiveInput archiveInput = new BizArchiveInput();
             BizCompany company = companies.stream().filter(v -> v.getName().equals(item.getCompanyName())).findFirst().orElse(null);
@@ -718,6 +727,17 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
             BigDecimal securityMonth = item.getSocialSecurityMonth() == null ? BigDecimal.ZERO : BigDecimal.valueOf(item.getSocialSecurityMonth());
             BigDecimal housingFundMonth = item.getHousingFundMonth() == null ? BigDecimal.ZERO : BigDecimal.valueOf(item.getHousingFundMonth());
             BigDecimal returnTaxMonth = item.getReturnTaxMonth() == null ? BigDecimal.ZERO : BigDecimal.valueOf(item.getReturnTaxMonth());
+            if(nameCountMap.get(item.getContractNo())>1L){
+                failureNum++;
+                failureMsg.append("<br/>").append(failureNum).append("导入的合同编号 ").append(item.getContractNo()).append("不能重复");
+                continue;
+            }
+            if(contNOs.contains(item.getContractNo())){
+                failureNum++;
+                failureMsg.append("<br/>").append(failureNum).append("合同编号 ").append(item.getContractNo()).append("已存在不能重复导入");
+                continue;
+            }
+
             if (keepAccount.compareTo(keepAccountPrice.multiply(keepAccountMonth)) != 0) {
                 failureNum++;
                 failureMsg.append("<br/>").append(failureNum).append("、订单 ").append(item.getContractNo()).append(" 记账总金额计算值与记账单价不符。");
@@ -899,6 +919,7 @@ public class BizArchiveInputServiceImpl extends ServiceImpl<BizArchiveInputMappe
                     int monthNum = (item.getHousingFundMonth() == null ? 0 : item.getHousingFundMonth()) + (item.getHousingFundFreeMonth() == null ? 0 : item.getHousingFundFreeMonth());
                     workOrder.setMonthNum(workOrder.getMonthNum() + monthNum);
                     workOrder.setEndMonth(workOrder.getEndMonth().compareTo(item.getHousingFundEndMonth()) > 0 ? workOrder.getEndMonth() : item.getHousingFundEndMonth());
+
                     workOrder.setStartMonth(workOrder.getStartMonth().compareTo(item.getHousingFundStartMonth()) > 0 ? item.getHousingFundStartMonth() : workOrder.getStartMonth());
                 }
                 BizWorkOrderDetail workOrderDetail = new BizWorkOrderDetail();

src/main/java/cn/ezhizao/project/business/workOrder/controller/BizWorkOrderController.java

@@ -281,7 +281,7 @@ public class BizWorkOrderController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizWorkOrder);
-        startPage();
+//        startPage();
         startOrderBy();
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         ExcelUtil<BizWorkOrder> util = new ExcelUtil<BizWorkOrder>(BizWorkOrder.class);
@@ -296,7 +296,7 @@ public class BizWorkOrderController extends BaseController {
     @PostMapping("/exportNoContract")
     public void exportNoContract(HttpServletResponse response, BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizWorkOrder);
-        startPage();
+//        startPage();
         startOrderBy();
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         List<BizWorkOrderNoContract> listNoContract = new ArrayList<>();

src/main/java/cn/ezhizao/project/business/workOrder/controller/WorkOrderServiceController.java

@@ -137,7 +137,7 @@ public class WorkOrderServiceController extends BaseController {
     public void exportLoop(HttpServletResponse response, BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizWorkOrder);
         bizWorkOrder.setType(1);
-        startPage();
+//        startPage();
         startOrderBy();
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         List<BizWorkOrderLoop> listLoop = new ArrayList<>();
@@ -179,7 +179,7 @@ public class WorkOrderServiceController extends BaseController {
     public void exportOnce(HttpServletResponse response, BizWorkOrder bizWorkOrder) throws NoSuchFieldException, IllegalAccessException {
         setTenantId(bizWorkOrder);
         bizWorkOrder.setType(2);
-        startPage();
+//        startPage();
         startOrderBy();
         List<BizWorkOrder> list = bizWorkOrderService.getList(bizWorkOrder);
         List<BizWorkOrderOnce> listOnce = new ArrayList<>();

src/main/resources/application-dev.yml

@@ -1,17 +1,21 @@
 # 数据源配置
 spring:
+    cloud:
+        nacos:
+            discovery:
+                server-addr: 154.8.178.69:8848 # Nacos服务器地址
     application:
-        name: ezhizao-yzbh-crm-zx
+        name: ezhizao-yzbh-crm
     # redis 配置
     redis:
         # 地址
-        host: 120.46.159.163
+        host: 62.234.54.84
         # 端口，默认为6379
-        port: 6379
+        port: 16379
         # 数据库索引
         database: 8
         # 密码
-        password: ezhizao.cn123456
+        password: yuchang@2023
         # 连接超时时间
         timeout: 10s
         lettuce:
@@ -30,9 +34,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://120.46.159.163:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
-                username: root
-                password: ezhizao.cn123456
+                url: jdbc:mysql://154.8.178.69:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
+                username: admin
+                password: admin
 #                url: jdbc:mysql://localhost:3306/ezhizao_yzbh_v2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=true&rewriteBatchedStatements=true&serverTimezone=GMT%2B8
 #                username: root
 #                password: 123456
@@ -84,4 +88,4 @@ spring:
                         multi-statement-allow: true
 # 文件上传
 ruoyi:
-    profile: D:/Ezhizao/yzbh/
+    profile: /home/ruoyi/yzbh/

src/main/resources/mybatis/business/BizCompanyMapper.xml

@@ -28,6 +28,9 @@
             c.deleted = 0
             <if test="id != null  and id != ''">AND c.id = #{id}</if>
             <if test="category != null  and category != ''">AND c.category = #{category}</if>
+            <if test="principal != null and principal != ''">
+                AND (c.leader_id=#{principal} OR c.adviser_id=#{principal})
+            </if>
             <if test="code != null  and code != ''">AND c.code = #{code}</if>
             <if test="keyword != null  and keyword != ''">AND (c.name like concat('%', #{keyword}, '%') or (c.code like #{keyword}))</if>
             <if test="name != null  and name != ''">AND c.name like concat('%', #{name}, '%')</if>