From e63e56a1b45bc2025147f7f91d248f93a43deb7a Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 12 四月 2024 15:10:41 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java index aafffd6..b79089e 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java @@ -205,6 +205,7 @@ 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()); @@ -234,6 +235,7 @@ 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);//鎻掑叆鏂扮殑绠$悊鍛樿处鍙� @@ -783,11 +785,12 @@ company.setIsdeleted(Constants.ZERO); LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(Constants.equalsInteger(company.getType(),Constants.ONE)){ - return new ArrayList<>(); +// 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.shop_id=company.id");//璁剧疆鏃犳晥璁块棶 + 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){ @@ -813,7 +816,7 @@ 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(Constants.equalsInteger(user.getType(),Constants.TWO)){ -- Gitblit v1.9.3