From 0e35f7cdaecc1c05f6a28784c2d66ce623ff77f1 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 09 十月 2024 10:23:05 +0800 Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit --- server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java index ff8ceb5..a79a985 100644 --- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java +++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java @@ -74,11 +74,11 @@ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐绫诲瀷涓嶆纭紝璇锋寜瑕佹眰濉啓~"); } //鏌ヨ鍚嶇О涓嶈兘閲嶅 - /* if(companyMapper.selectCount(new QueryWrapper<Company>().lambda() + if(companyMapper.selectCount(new QueryWrapper<Company>().lambda() .eq(Company::getName,company.getName()) .eq(Company::getIsdeleted,Constants.ZERO)) >0){ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐鍚嶇О涓嶈兘閲嶅~"); - }*/ + } LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(user ==null){ user = company.getLoginUserInfo(); @@ -275,12 +275,12 @@ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐绫诲瀷涓嶆纭紝璇锋寜瑕佹眰濉啓~"); } //鏌ヨ鍚嶇О涓嶈兘閲嶅 - /* if(companyMapper.selectCount(new QueryWrapper<Company>().lambda() + if(companyMapper.selectCount(new QueryWrapper<Company>().lambda() .eq(Company::getName,company.getName()) .ne(Company::getId,company.getId()) .eq(Company::getIsdeleted,Constants.ZERO)) >0){ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "瀵逛笉璧凤紝缁勭粐鍚嶇О涓嶈兘閲嶅~"); - }*/ + } LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(user == null){ user = company.getLoginUserInfo(); -- Gitblit v1.9.3