Merge branch 'KF-30' into 'master'

Kf 30

See merge request !21

src/main/java/cn/quantgroup/xyqb/service/user/impl/OauthLoginInfoServiceImpl.java

@@ -41,6 +41,7 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void addLoginInfo(User user, Integer tenantId) {
+        log.info("=addLoginInfo= -> user={}, tenetId={}", user, tenantId);
         OauthClientDetailsEntity oauthClientDetailsEntity = oauthClientDetailsRepository.findFirstByClientId(tenantId);
         if (oauthClientDetailsEntity != null) {
             String institutionId = oauthClientDetailsEntity.getInstitutionId();
@@ -61,6 +62,7 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
                 Integer partitionKey = atomicSequencer.partitionKey(customerId);
                 productLoginEntity = EntityBuilder.productLogin(productId, institutionId, phoneNo, customerId, customerName, partitionKey, id);
                 productLoginEntity.setExtensionAccountId(userId);
+                log.info("=save productLoginRepository= {}", productLoginEntity);
                 productLoginRepository.save(productLoginEntity);
                 // 根据customerId 获取uuid
                 CustomerLoginEntity customerLoginEntity = customerLoginRepository.findFirstByCustomerId(productLoginEntity.getCustomerId());
@@ -80,6 +82,7 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
                 customerLogin.setModifiedDate(new Date());
                 customerLogin.setCreatedBy("");
                 customerLogin.setModifiedBy("");
+                log.info("=save customerLoginRepository= {}", customerLogin);
                 customerLoginRepository.save(customerLogin);
 
                 // 添加用户信息表
@@ -93,6 +96,7 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
                 customerInfo.setModifiedDate(new Date());
                 customerInfo.setCreatedBy("");
                 customerInfo.setModifiedBy("");
+                log.info("=save customerInfoRepository= {}", customerInfo);
                 customerInfoRepository.save(customerInfo);
 
             }
@@ -102,6 +106,7 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
     @Override
     @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void addRegisterInfo(User user, AppletParamEntry appletParamEntry) {
+        log.info("=addRegisterInfo= -> User={}, AppletParamEntry={}", user, appletParamEntry);
         OauthClientDetailsEntity oauthClientDetailsEntity = oauthClientDetailsRepository.findFirstByClientId(appletParamEntry.getTenantId());
         if (oauthClientDetailsEntity != null) {
             String institutionId = oauthClientDetailsEntity.getInstitutionId();
@@ -121,6 +126,7 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
                 Integer partitionKey = atomicSequencer.partitionKey(customerId);
                 productLoginEntity = EntityBuilder.productLogin(productId, institutionId, phoneNo, customerId, customerName, partitionKey, id);
                 productLoginEntity.setExtensionAccountId(userId);
+                log.info("=save productLoginRepository= {}", productLoginEntity);
                 productLoginRepository.save(productLoginEntity);
                 // 根据customerId 获取uuid
                 CustomerLoginEntity customerLoginEntity = customerLoginRepository.findFirstByCustomerId(productLoginEntity.getCustomerId());
@@ -140,6 +146,7 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
                 customerLogin.setModifiedDate(new Date());
                 customerLogin.setCreatedBy("");
                 customerLogin.setModifiedBy("");
+                log.info("=save customerLoginRepository= {}", customerLogin);
                 customerLoginRepository.save(customerLogin);
 
                 // 添加用户信息表
@@ -164,6 +171,7 @@ public class OauthLoginInfoServiceImpl implements IOauthLoginInfoService {
                 customerInfo.setModifiedDate(new Date());
                 customerInfo.setCreatedBy("");
                 customerInfo.setModifiedBy("");
+                log.info("=save customerInfoRepository= {}", customerInfo);
                 customerInfoRepository.save(customerInfo);
 
             }

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserCenterServiceImpl.java

@@ -52,20 +52,17 @@ public class UserCenterServiceImpl implements UserCenterService {
         List<UserAttached> userAttacheds = userAttachedRepository.findByUserIdIn(userIds);
         if (!tenantId.equals(TenantUtil.TENANT_DEFAULT)) {
             if (userAttacheds != null) {
-                //租户ID校验
-                if (!TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
-                    List<User> users = userRepository.findByIdIn(userIds);
-                    List<User> productUsers = tenantService.selectUsersByTenantId(users, tenantId);
-                    if (productUsers != null) {
-                        List<Long> collect = productUsers.stream().map(User::getId).collect(Collectors.toList());
-                        userAttacheds.forEach(a->{
-                            if (collect.contains(a.getUserId())) {
-                                resultProductUsers.add(a);
-                            }
-                        });
-                    }
-                    return resultProductUsers;
+                List<User> users = userRepository.findByIdIn(userIds);
+                List<User> productUsers = tenantService.selectUsersByTenantId(users, tenantId);
+                if (productUsers != null) {
+                    List<Long> collect = productUsers.stream().map(User::getId).collect(Collectors.toList());
+                    userAttacheds.forEach(a->{
+                        if (collect.contains(a.getUserId())) {
+                            resultProductUsers.add(a);
+                        }
+                    });
                 }
+                return resultProductUsers;
             }
         }else {
             List<User> users = userRepository.findByIdIn(userIds);

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -113,7 +113,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
         Map<Long, String> userIdAndPhoneMap = Maps.newHashMap();
         List<User> users = userRepository.findByIdIn(userIds);
         //校验租户ID
-        if (!TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
+        if (!tenantId.equals(tenantId)) {
             users = tenantService.selectUsersByTenantId(users, tenantId);
         }else {
             users = tenantService.validationTentIdByTentId(users, tenantId);
@@ -390,10 +390,8 @@ public class UserServiceImpl implements IUserService, IBaseController {
         } catch (Exception e) {
             log.info("神策埋点出现问题", e);
         }
-        //校验租户ID tenantId
-        if (!TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
-            oauthLoginInfoService.addLoginInfo(user, tenantId);
-        }
+
+        oauthLoginInfoService.addLoginInfo(user, tenantId);
         LoginProperties loginProperties = new LoginProperties("", 3, channelId, createdFrom, appChannel, merchant.getId(), merchant.getName(), tenantId);
         AuthBean session = sessionService.createSession(user, loginProperties);
         session.setRegister(register);
@@ -507,23 +505,17 @@ public class UserServiceImpl implements IUserService, IBaseController {
                     .collect(Collectors.toList());
             List<User> users = userRepository.findByIdIn(collect);
             if (!tenantId.equals(TenantUtil.TENANT_DEFAULT)) {
-                if (!TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
-                    return tenantService.selectUsersByTenantId(users, tenantId);
-                }
+                return tenantService.selectUsersByTenantId(users, tenantId);
             }else {
                 return tenantService.validationTentIdByTentId(users, tenantId);
             }
-            return users;
         } else { //不是1 就是  uuids
             List<User> users = userRepository.findByUuidIn(vals);
             if (!tenantId.equals(TenantUtil.TENANT_DEFAULT)) {
-                if (!TenantUtil.validationTenantIdIsNullOrZero(tenantId)) {
-                    return tenantService.selectUsersByTenantId(users, tenantId);
-                }else {
-                    return tenantService.validationTentIdByTentId(users, tenantId);
-                }
+                return tenantService.selectUsersByTenantId(users, tenantId);
+            }else {
+                return tenantService.validationTentIdByTentId(users, tenantId);
             }
-            return users;
         }
     }