From ccf9dfb83b9846974c569161502b784c668ee307 Mon Sep 17 00:00:00 2001
From: ZQN <364596817@qq.com>
Date: 星期二, 18 六月 2024 16:48:07 +0800
Subject: [PATCH] 企业字段添加,执法评价添加

---
 project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
index 7988c94..b92f1d6 100644
--- a/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
+++ b/project-system/src/main/java/com/project/system/service/impl/SysCompanyServiceImpl.java
@@ -118,6 +118,7 @@
      */
     private void validEntityBeforeSave(SysCompany entity, int isImport)
     {
+        entity.setIsImport(isImport);
         if (isImport!=1){
             if (StringUtils.isEmpty(entity.getCompanyImg())){
                 throw new BaseException(String.format("%1$s锛岃涓婁紶钀ヤ笟鎵х収", entity.getCompanyName()));
@@ -179,7 +180,8 @@
         SysCompany one = this.getOne(lq().eq(SysCompany::getCompanyCode, entity.getCompanyCode()));
         String phone = entity.getCompanyPhone();
         user.setPhonenumber(phone);
-        user.setUserName(entity.getCompanyUser());
+        user.setUserName(phone);
+        user.setNickName(entity.getCompanyUser());
         user.setPassword(phone);
         user.setDeptId(one.getCompanyId());
         user.setUserType("02");
@@ -227,6 +229,8 @@
             qw.eq(StringUtils.isNotEmpty(bo.getCompanyPhone()), "company_phone", bo.getCompanyPhone());
             qw.eq(StringUtils.isNotEmpty(bo.getCompanyAddress()), "company_address", bo.getCompanyAddress());
             qw.eq(StringUtils.isNotEmpty(bo.getCompanyImg()), "company_img", bo.getCompanyImg());
+            qw.eq(StringUtils.isNotEmpty(bo.getCompanyType()), "company_type", bo.getCompanyType());
+            qw.eq(bo.getIsImport() != null, "is_import", bo.getIsImport());
             qw.eq(bo.getCompanyStatus() != null, "company_status", bo.getCompanyStatus());
             qw.eq(StringUtils.isNotEmpty(bo.getRegionCode()), "region_code", bo.getRegionCode());
             qw.like(StringUtils.isNotEmpty(bo.getRegionName()), "region_name", bo.getRegionName());

--
Gitblit v1.9.1