bug

jiangping

2023-12-06 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5

 server/src/main/java/doumeemes/service/ext/impl/CompanyExtServiceImpl.java

@@ -134,7 +134,7 @@
        com.setLinkPhone(user.getLinkPhone());
        com.setAddr(user.getAddr());
        com.setFileStoreAddr(user.getFileStoreAddr());
        com.setOpenUserNum(-1);
        com.setOpenUserNum(Constants.formatIntegerNum(user.getOpenUserNum()));
        com.setShortName(user.getRemark());
        com.setOpenModules(Constants.ONE+"");
        com.setOepnType(user.getOepnType());
@@ -146,15 +146,15 @@
//     插入 企业账户开通历史记录表
        CompanyOpen companyOpen = new CompanyOpen();
        companyOpen.setDeleted(Constants.ZERO);
//        companyOpen.setCreateUser();
        companyOpen.setCreateTime(new Date());
//        companyOpen.setUpdateUser();
        companyOpen.setUpdateTime(new Date());
        companyOpen.setCompanyId(com.getId());
//        companyOpen.setUserNum();
//        companyOpen.setModules();
        companyOpen.setValidDate(user.getOepnValidDate());
        companyOpen.setOepnType(user.getOepnType());
//        companyOpen.setCreateUser();
//        companyOpen.setUpdateUser();
//        companyOpen.setUserNum();
//        companyOpen.setModules();
        companyOpenExtMapper.insert(companyOpen);

        //创建根目录
@@ -243,7 +243,6 @@
            }
        }
        initRedisCache(com);

        systemUserBiz.importPlat(user,pwd,com);
        return com.getId();
    }
@@ -276,6 +275,7 @@
        com.setOepnValidDate(user.getOepnValidDate());
        com.setLinker(user.getLinkName());
        com.setLinkPhone(user.getLinkPhone());
        com.setOpenUserNum(user.getOpenUserNum());
        com.setAddr(user.getAddr());
        com.setFileStoreAddr(user.getFileStoreAddr());
        com.setShortName(user.getRemark());
@@ -331,7 +331,7 @@
    }
    @Override
    @Transactional(rollbackFor = {BusinessException.class,Exception.class})
    public Company createByLingyang(UserDTO user, String pwd){
    public Company createByLingyang(UserDTO user,Date date,String remark, String pwd){
        AutoLoginUserDTO param = new AutoLoginUserDTO();
        param.setOrgName(user.getOrgName());
        param.setName(user.getName());
@@ -341,6 +341,8 @@
        param.setManager(user.getManager());
        param.setUserinfo(JSONObject.toJSONString(user));
        param.setOrigin(Constants.COMPANY_ORIGIN.lingyang);
        param.setDate(date!=null ?date:new Date());
        param.setRemark(remark);
       return createByThirdParam(param,pwd);
    }
    public Company createByThirdParam(AutoLoginUserDTO user, String pwd){
@@ -356,19 +358,32 @@
                //如果企业信息为空，新增企业信息
                com = new Company();
                com.setDeleted(Constants.ZERO);
                com.setCreateTime(new Date());
                com.setCreateTime(user.getDate()!=null?user.getDate():new Date());
                com.setIsNew(Constants.ONE);
//                com.setOrigin(Constants.THREE);
                com.setCreditCode(user.getCreditCode());
                com.setName(user.getOrgName());
                com.setLingyangInfo(user.getUserinfo());
                com.setLegalPersonPhone(user.getPhone());
                com.setOpenUserNum(-1);
                //测试羚羊手动导入（标记）
                com.setRemark(user.getRemark());
                //默认限制人员10
                if(user.getOrigin() == Constants.COMPANY_ORIGIN.lingyang){
                    int userNum = 10;
                    try {
                        userNum =Integer.parseInt(systemDictDataBiz.queryByCode(Constants.LINGYANG_PARAM, Constants.LINGYANG_USERNUM_LIMIT).getCode());
                    }catch (Exception e){
                    }
                    com.setOpenUserNum(userNum);
                }else{
                    com.setOpenUserNum(-1);
                }
                com.setOpenModules(Constants.ONE+"");
                com.setOepnValidDate(DateUtil.StringToDate("2099-12-31 09:25:09"));
                com.setOepnType(Constants.ONE);
                com.setStatus(Constants.ONE);
                com.setChannelId(Constants.TWO);
                com.setOrigin(user.getOrigin());
//                com.setDingdingId(user.getco);
                //插入企业信息
                companyExtMapper.insert(com);

@@ -456,6 +471,16 @@
                    }
                }
                initRedisCache(com);
            }else{
                Department department = new Department();
                department.setCompanyId(com.getId());
                department.setDeleted(Constants.ZERO);
                department.setType(Constants.DEPART_TYPE.com);
                department = departmentExtMapper.selectOne(new QueryWrapper<>(department).last("limit 1"));
                if(department == null){
                    throw  new BusinessException(ResponseStatus.ERR_STATUS.getCode(),"对不起，企业信息异常，请联系系统管理员！");
                }
                com.setRootDepartment(department);
            }
        }else{
            if(com == null){