From c50194bd856dbb5e6ecdb18e8f9227e82cc419ee Mon Sep 17 00:00:00 2001
From: bynt <ningtao/19960909>
Date: Wed, 15 Jun 2022 18:00:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=AC=E5=8F=B8=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/baiye/modules/system/domain/User.java  | 3 +++
 .../modules/system/repository/CompanyRepository.java     | 9 +++++++++
 .../com/baiye/modules/system/service/CompanyService.java | 7 +++++++
 .../modules/system/service/impl/CompanyServiceImpl.java  | 5 +++++
 .../modules/system/service/impl/UserServiceImpl.java     | 8 +++++++-
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/User.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/User.java
index de938a15..68d55e23 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/User.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/domain/User.java
@@ -118,6 +118,9 @@ public class User extends BaseEntity implements Serializable {
     private Boolean isReview;
 
 
+    @Transient
+    private Long templateId;
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/CompanyRepository.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/CompanyRepository.java
index 3643d978..5494d9d4 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/CompanyRepository.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/repository/CompanyRepository.java
@@ -78,4 +78,13 @@ public interface CompanyRepository extends JpaRepository<Company, Long>, JpaSpec
      * @return
      */
     List<Company> findByTemplateId(Long templateId);
+
+    /**
+     * id修改公司模板
+     * @param templateId
+     * @param companyId
+     */
+    @Modifying
+    @Query("UPDATE Company set templateId = ?1 where id = ?2")
+    void updateCompanyTemplateIdById(Long templateId, Long companyId);
 }
diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/CompanyService.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/CompanyService.java
index 39d909c3..15f8aa61 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/CompanyService.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/CompanyService.java
@@ -81,4 +81,11 @@ public interface CompanyService {
      * @return
      */
     List<Company> findByCompanyListByBalance();
+
+    /**
+     * 修改公司id
+     * @param templateId
+     * @param companyId
+     */
+    void updateCompanyTemplateId(Long templateId, Long companyId);
 }
diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CompanyServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CompanyServiceImpl.java
index cdc1a43e..98a7d34e 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CompanyServiceImpl.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/CompanyServiceImpl.java
@@ -145,4 +145,9 @@ public class CompanyServiceImpl implements CompanyService {
     public List<Company> findByCompanyListByBalance() {
         return companyRepository.findCompanyAndUserBalanceLessThanZero();
     }
+
+    @Override
+    public void updateCompanyTemplateId(Long templateId, Long companyId) {
+         companyRepository.updateCompanyTemplateIdById(templateId,companyId);
+    }
 }
diff --git a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java
index 8d8d42a6..148022f6 100644
--- a/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java
+++ b/manage/ad-platform-management/src/main/java/com/baiye/modules/system/service/impl/UserServiceImpl.java
@@ -365,7 +365,7 @@ public class UserServiceImpl implements UserService {
             redisUtils.del(CacheKey.ROLE_AUTH + resources.getId());
         }
         // 如果用户被禁用，则清除用户登录信息
-        if (!resources.getEnabled()) {
+        if (Boolean.FALSE.equals(resources.getEnabled())) {
             onlineUserService.kickOutForUsername(resources.getUsername());
         }
 
@@ -375,6 +375,11 @@ public class UserServiceImpl implements UserService {
                             .getCompanyName().trim().concat(StrPool.COLON).concat(resources.getUsername());
             user.setUsername(username);
         }
+
+        if (ObjectUtil.isNotNull(resources.getTemplateId())) {
+            companyService.updateCompanyTemplateId(resources.getTemplateId(), user.getCompanyId());
+        }
+
         user.setIsReview(resources.getIsReview());
         user.setEmail(resources.getEmail());
         user.setEnabled(resources.getEnabled());
@@ -401,6 +406,7 @@ public class UserServiceImpl implements UserService {
         user.setPhone(resources.getPhone());
         user.setGender(resources.getGender());
         userRepository.save(user);
+
         // 清理缓存
         delCaches(user.getId(), user.getUsername());
     }