Merge branch 'front' into devlop

skyouc

2025-03-21 8a141fa444e3d605f05763c6003085c24880e5c6

 rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/TenantServiceImpl.java

@@ -4,6 +4,9 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.domain.BusinessRes;
import com.vincent.rsf.server.common.exception.BusinessException;
import com.vincent.rsf.server.common.service.EmailService;
import com.vincent.rsf.server.system.controller.param.TenantInitParam;
import com.vincent.rsf.server.system.entity.*;
import com.vincent.rsf.server.system.enums.StatusType;
@@ -32,22 +35,27 @@
    private UserRoleService userRoleService;
    @Autowired
    private RoleMenuService roleMenuService;
    @Autowired
    private EmailService emailService;

    @Override
    @Transactional
    public Boolean initTenant(TenantInitParam param) {
    public Long initTenant(TenantInitParam param) {
        // valid ----------------------------
        if (null == param) {
            return false;
            return null;
        }
        if (Cools.isEmpty(param.getName(), param.getFlag(), param.getUsername(), param.getPassword())) {
            return false;
            return null;
        }

        if (null != userService.getByUsername(param.getUsername(), null)) {
            throw new CoolException("the username already exist");
            throw new BusinessException(BusinessRes.USERNAME_EXIST);
        }
        if (!Cools.isEmpty(param.getEmail())) {
            if (!emailService.isValid(param.getEmail())) {
                throw new CoolException("Please enter a valid email address");
            }
            if (null != userService.getByEmail(param.getEmail(), null)) {
                throw new CoolException("the email already exist");
            }
@@ -125,7 +133,7 @@
            }
        }

        return true;
        return tenant.getId();
    }

}