修改公司模板

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) {

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);
 }

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);
 }

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);
+    }
 }

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());
     }