Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

k94314517

2024-06-19 7e01b349c769045abeeeb6cf98241c8d60d0aeb3

 server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -194,6 +194,12 @@
                .eq(SystemUser::getUsername,company.getUsername()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该登录账号已存在，请更新重试~");
        }
        if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted,Boolean.TRUE)
                .eq(SystemUser::getMobile,company.getPhone()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该手机号已存在，请更换重试~");
        }

        SystemUser user = new SystemUser();
        user.setUsername(company.getUsername());
        // 生成密码盐
@@ -201,10 +207,11 @@
        // 生成密码
        user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt));
        user.setSalt(salt);
        user.setType(Constants.ONE);
        user.setType(Constants.equalsInteger(company.getType(),Constants.ZERO)?Constants.ONE:Constants.TWO);
        user.setFixed(Boolean.TRUE);
        user.setDeleted(Boolean.FALSE);
        user.setCompanyId(company.getId());
        user.setRealname(company.getLegalName());
        user.setMobile(company.getPhone());
        user.setCreateUser(company.getCreator());
        user.setCreateTime(company.getCreateDate());
@@ -217,6 +224,12 @@
                .eq(SystemUser::getUsername,company.getUsername()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该登录账号已存在，请更新重试~");
        }
        if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted,Boolean.TRUE)
                .ne(SystemUser::getUsername,company.getUsername())
                .eq(SystemUser::getMobile,company.getPhone()))>0){
            throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，该手机号已存在，请更新重试~");
        }
        SystemUser model = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
                .eq(SystemUser::getDeleted,Boolean.TRUE)
                .eq(SystemUser::getUsername,oldUserName).last("limit 1"));
@@ -228,16 +241,18 @@
            // 生成密码
            user.setPassword(Utils.Secure.encryptPassword(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.DEFAULT_PASSWORD).getCode(), salt));
            user.setSalt(salt);
            user.setType(Constants.ONE);
            user.setType(Constants.equalsInteger(company.getType(),Constants.ZERO)?Constants.ONE:Constants.TWO);
            user.setFixed(Boolean.TRUE);
            user.setDeleted(Boolean.FALSE);
            user.setCompanyId(company.getId());
            user.setMobile(company.getPhone());
            user.setCreateUser(company.getCreator());
            user.setRealname(company.getLegalName());
            user.setCreateTime(company.getCreateDate());
            user.setStatus(Constants.ZERO);
            systemUserMapper.insert(user);//插入新的管理员账号
        }else{
            model.setMobile(company.getPhone());
            model.setUsername(company.getUsername());
            model.setCreateUser(company.getCreator());
            model.setCreateTime(company.getCreateDate());
@@ -366,14 +381,14 @@
        }else  {
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请上传营业执照！");
        }
        if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
            multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
        }else {
//        if(company.getSignImg()!=null && StringUtils.isNotBlank(company.getSignImg().getFileurl())){
//            multifileList.add(initMultiFileByCompay(company,company.getSignImg(),Constants.MultiFile.COM_SING_IMG.getKey()));
//        }else {
         //   throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请上传电子签章！");
        }
//        }
        if(company.getIdcardImgList()!=null && company.getIdcardImgList()!=null&& company.getIdcardImgList().size()>0){
            for(Multifile f : company.getIdcardImgList()){
                multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
                    multifileList.add(initMultiFileByCompay(company,f,Constants.MultiFile.COM_IDCARD_IMG.getKey()));
            }
        }else {
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请上传身份证扫描件！");
@@ -575,6 +590,7 @@
        company.setCreateDate(update.getEditDate());
        if(StringUtils.isNotBlank(company.getUsername())){
            //处理登陆账号信息
            company.setType(model.getType());
            dealSystemUserDataForUpdate(company,model.getUsername());
        }

@@ -782,22 +798,27 @@
        company.setIsdeleted(Constants.ZERO);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Constants.equalsInteger(company.getType(),Constants.ONE)){

        }else {
            //如果查询企业数据
            if(company.getQueryFlag() == 0){
                //只能看权限范围内
                if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
                    wrapper.lambda().eq(Company::getId,-1);//设置无效访问
                }else {
                    wrapper.lambda().in(Company::getId, user.getCompanyIdList());
//                return new ArrayList<>();
        }else  {
            company.setType(Constants.ZERO);
            if(Constants.equalsInteger(user.getType(),Constants.TWO)){
                //如果是商户
                wrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.company_id=company.id and  c.shop_id="+user.getCompanyId());//设置无效访问
            }else{
                //如果查询企业数据
                if(company.getQueryFlag() == 0){
                    //只能看权限范围内
                    if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
                        wrapper.lambda().eq(Company::getId,-1);//设置无效访问
                    }else {
                        wrapper.lambda().in(Company::getId, user.getCompanyIdList());
                    }
                } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
                    //查詢是否有查看權限
                    wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
                }
            } else if (company.getQueryFlag() == 1 && company.getUserId()!=null) {
                //查詢是否有查看權限
                wrapper.select("*,(select count(1) from company_permission b where b.user_id="+company.getUserId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
            }
        }

        return companyMapper.selectList(wrapper);
    }

@@ -808,23 +829,30 @@
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE) {
        if(Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ONE||Constants.formatIntegerNum(pageWrap.getModel().getType()) == Constants.ZERO) {

        }else{
            //如果查询企业数据，只能看权限范围内
            if(pageWrap.getModel().getQueryFlag() == 0){
                //只能看权限范围内
                if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
                    queryWrapper.lambda().eq(Company::getId,-1);//设置无效访问
                }else {
                    queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
                }
            if(Constants.equalsInteger(user.getType(),Constants.TWO)){
                //如果是商户
                queryWrapper.lambda().exists("select c.id from company_solution c where c.isdeleted=0 and c.shop_id=company.id");//设置无效访问
            }else{
                //如果查询企业数据，只能看权限范围内
                if(pageWrap.getModel().getQueryFlag() == 0){
                    //只能看权限范围内
                    if(user.getCompanyIdList() == null || user.getCompanyIdList().size() == 0){
                        queryWrapper.lambda().eq(Company::getId,-1);//设置无效访问
                    }else {
                        queryWrapper.lambda().in(Company::getId, user.getCompanyIdList());
                    }
//            queryWrapper.exists("select b.id from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id");
            } else if (pageWrap.getModel().getQueryFlag() == 1) {
                //查詢是否有查看權限
                queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
                } else if (pageWrap.getModel().getQueryFlag() == 1) {
                    //查詢是否有查看權限
                    queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
                }
            }

        }

        if (pageWrap.getModel().getId() != null) {
            queryWrapper.lambda().eq(Company::getId, pageWrap.getModel().getId());
        }