From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 04 七月 2025 17:56:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 292 ++++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 243 insertions(+), 49 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 3a539a9..7bc78a6 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
@@ -10,6 +10,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
+import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.join.CompanySolutionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemUserMapper;
@@ -28,6 +29,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Indexed;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -38,7 +40,9 @@
import java.lang.reflect.Array;
import java.net.URI;
import java.net.URLEncoder;
+import java.nio.charset.Charset;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 浼佷笟淇℃伅琛⊿ervice瀹炵幇
@@ -52,6 +56,10 @@
private boolean debugModel;
@Autowired
private CompanyMapper companyMapper;
+ @Autowired
+ private CompanyJoinMapper companyJoinMapper;
+ @Autowired
+ private CompanyDepartmentMapper companyDepartmentMapper;
@Autowired
private SystemUserMapper systemUserMapper;
@Autowired
@@ -68,6 +76,8 @@
private SmsEmailMapper smsEmailMapper;
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private NoticesMapper noticesMapper;
@Override
@Transactional
@@ -92,14 +102,37 @@
companyMapper.insert(company);
company.setEditDate(company.getCreateDate());
company.setEditor(user.getId());
+ //鏂板缓榛樿缁勭粐
+ CompanyDepartment department = createDefaultDepart(company);
//澶勭悊鐧婚檰璐﹀彿淇℃伅
- dealSystemUserData(company);
+ SystemUser sysuser = dealSystemUserData(company,department.getId());
//澶勭悊闄勪欢淇℃伅
dealFileData(company);
//澶勭悊鍏宠仈鏂规
dealSolutionsData(company);
return company;
}
+
+ private CompanyDepartment createDefaultDepart(Company company) {
+ CompanyDepartment depart = new CompanyDepartment();
+ depart.setCompanyId(company.getId());
+ depart.setCreator(company.getCreator());
+ depart.setCreateDate(company.getCreateDate());
+ depart.setType(Constants.equalsInteger(company.getType(),Constants.ZERO)?Constants.ONE:Constants.TWO);
+ depart.setName(company.getName());
+ depart.setIsdeleted(Constants.ZERO);
+ depart.setNamePath(company.getName());
+ depart.setStatus(Constants.ZERO);
+ depart.setRemark("榛樿鏍圭粍缁�");
+ companyDepartmentMapper.insert(depart);
+
+ depart.setIdPath(company.getId()+"/");
+ companyDepartmentMapper.updateById(depart);//鏇存柊璺緞
+
+ return depart;
+
+ }
+
@Override
@Transactional
public Company createShop(Company company) {
@@ -121,16 +154,19 @@
company.setSignStatus(Constants.ZERO);
company.setSignIdStatus(Constants.ZERO);
companyMapper.insert(company);
+
company.setEditDate(company.getCreateDate());
company.setEditor(user.getId());
//澶勭悊鐧婚檰璐﹀彿淇℃伅
- dealSystemUserData(company);
+ dealSystemUserData(company,createDefaultDepart(company).getId());
//澶勭悊闄勪欢淇℃伅
dealFileData(company);
return company;
}
+
+
@Override
- @Transactional
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void updateSolutions(Company company) {
if(company.getId()==null
||company.getSolutionList() == null
@@ -141,7 +177,6 @@
if(model == null || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO) ){
throw new BusinessException(ResponseStatus.DATA_EMPTY );
}
- companySolutionJoinMapper.delete(new UpdateWrapper<CompanySolution>().lambda().eq(CompanySolution::getCompanyId,company.getId()));
//澶勭悊鍏宠仈鏂规
dealSolutionsData(company);
}
@@ -176,8 +211,9 @@
if(fileList == null || fileList.size() == 0){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- String fileName = model.getName() +"_浼佷笟璇佷欢_"+System.currentTimeMillis()+".zip" ;
- String encodeFileName = URLEncoder.encode(fileName);
+
+ String fileName = model.getName() +"-浼佷笟璇佷欢-"+System.currentTimeMillis() ;
+ String encodeFileName =URLEncoder.encode(fileName, Charset.forName("UTF-8").toString())+".zip";
response.setHeader("Content-Disposition","attachment;filename=" + encodeFileName);
response.setContentType("application/octet-stream");
response.setHeader("eva-opera-type", "download");
@@ -188,12 +224,18 @@
}
}
- private void dealSystemUserData(Company company) {
+ private SystemUser dealSystemUserData(Company company, Integer departId) {
if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getDeleted,Boolean.TRUE)
.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,21 +243,30 @@
// 鐢熸垚瀵嗙爜
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.setDepartmentId(departId);
user.setCreateTime(company.getCreateDate());
user.setStatus(Constants.ZERO);
systemUserMapper.insert(user);
+ return user;
}
private void dealSystemUserDataForUpdate (Company company,String oldUserName) {
if(systemUserMapper.selectCount(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getDeleted,Boolean.TRUE)
.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)
@@ -228,16 +279,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());
@@ -256,6 +309,104 @@
List<CompanySolution> list = new ArrayList<>();
int num =0;
Date date = new Date();
+ List<CompanySolution> addList = new ArrayList<>();
+ List<CompanySolution> delList = new ArrayList<>();
+ List<CompanySolution> updList = new ArrayList<>();
+ List<CompanySolution> companySolutionList = companySolutionJoinMapper.selectList(new QueryWrapper<CompanySolution>().lambda().eq(CompanySolution::getCompanyId,company.getId()));
+ for(CompanySolution s :company.getSolutionList()){
+ if(companySolutionList.stream().filter(i->Constants.equalsInteger(i.getSolutionBaseId(),s.getSolution().getBaseId())).collect(Collectors.toList()).size()>Constants.ZERO){
+ updList.add(s);
+ }else{
+ addList.add(s);
+ }
+ }
+ for (CompanySolution s:companySolutionList) {
+ if( addList.stream().filter(i->Constants.equalsInteger(i.getSolution().getBaseId(),s.getSolutionBaseId())).collect(Collectors.toList()).size()>Constants.ZERO
+ || updList.stream().filter(i->Constants.equalsInteger(i.getSolution().getBaseId(),s.getSolutionBaseId())).collect(Collectors.toList()).size()>Constants.ZERO
+ ){
+ continue;
+ }
+ delList.add(s);
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(delList)){
+ companySolutionJoinMapper.delete(new UpdateWrapper<CompanySolution>().lambda().in(CompanySolution::getId,delList.stream().map(i->i.getId()).collect(Collectors.toList())));
+ }
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(addList)){
+ for(CompanySolution s :addList){
+ if(Objects.isNull(s.getSolution())){
+ continue;
+ }
+ if(s.getSolution().getBaseId() == null){
+ continue;
+ }
+ Solutions newVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,s.getSolution().getBaseId())
+ .eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
+ if(Objects.isNull(newVersion)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
+ }
+ //鏌ヨ鏂规鐨勬柟妗堢‘璁や功
+ Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjId,newVersion.getId())
+ );
+ if(Objects.isNull(multifile) || StringUtils.isBlank(multifile.getFileurl())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规纭涔︼紒");
+ }
+ sIds.add(s.getSolution().getBaseId());
+ s.setCompanyId(company.getId());
+ s.setIsdeleted(Constants.ZERO);
+ s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
+ s.setCanReduce(Constants.formatIntegerNum(s.getCanReduce()));
+ s.setCreateDate(date);
+ s.setCreator(company.getCreator());
+ s.setSortnum(num++);
+ s.setSolutionBaseId( s.getSolution().getBaseId() );
+ s.setSolutionId( newVersion.getId() );
+ s.setStatus(Constants.ZERO);
+ s.setFileUrl(multifile.getFileurl());
+ s.setSignStatus(Constants.ZERO);
+ s.setSolutionName(newVersion.getName());
+ list.add(s);
+ }
+ if(list.size() ==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
+ }
+ List<Solutions> solutionsList = solutionsMapper.selectList(new QueryWrapper<Solutions>().lambda()
+ .in(Solutions::getId,sIds)
+ .eq(Solutions::getIsdeleted,Constants.ZERO));
+ if(solutionsList.size()!= list.size()){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅鍝�");
+ }
+ for(Solutions s:solutionsList){
+ if(Constants.equalsInteger(s.getStatus(),Constants.ONE)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇濋櫓鏂规銆�"+s.getName()+"銆戝凡琚鐢紝涓嶈兘杩涜璇ユ搷浣�");
+ }
+ }
+ companySolutionJoinMapper.insert(list);
+ //瀛樺偍寰呭姙淇℃伅
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SOLUTIONS;
+ for (CompanySolution s:list) {
+ Solutions newVersion = solutionsMapper.selectById(s.getSolutionId());
+ //骞冲彴寰呭姙
+ Notices notices = new Notices(noticeObjectType,
+ Constants.ONE
+ ,s.getId(),
+ newVersion.getName() ,
+ company.getId()
+ ,Constants.NoticeType.ZERO);
+ noticesMapper.insert(notices);
+
+ }
+
+ }
+ }
+
+ /*private void dealSolutionsData(Company company) {
+ List<Integer> sIds = new ArrayList<>();
+ List<CompanySolution> list = new ArrayList<>();
+ int num =0;
+ Date date = new Date();
for(CompanySolution s :company.getSolutionList()){
if(Objects.isNull(s.getSolution())){
continue;
@@ -268,6 +419,15 @@
if(Objects.isNull(newVersion)){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇锋坊鍔犳湁鏁堢殑淇濋櫓鏂规淇℃伅锛�");
}
+ //鏌ヨ鏂规鐨勬柟妗堢‘璁や功
+ Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey())
+ .eq(Multifile::getIsdeleted,Constants.ZERO)
+ .eq(Multifile::getObjId,newVersion.getId())
+ );
+ if(Objects.isNull(multifile) || StringUtils.isBlank(multifile.getFileurl())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鏈煡璇㈠埌鏂规纭涔︼紒");
+ }
sIds.add(s.getSolution().getBaseId());
s.setCompanyId(company.getId());
s.setIsdeleted(Constants.ZERO);
@@ -279,6 +439,8 @@
s.setSolutionBaseId( s.getSolution().getBaseId() );
s.setSolutionId( newVersion.getId() );
s.setStatus(Constants.ZERO);
+ s.setFileUrl(multifile.getFileurl());
+ s.setSignStatus(Constants.ZERO);
list.add(s);
}
if(list.size() ==0){
@@ -295,8 +457,13 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇濋櫓鏂规銆�"+s.getName()+"銆戝凡琚鐢紝涓嶈兘杩涜璇ユ搷浣�");
}
}
- companySolutionJoinMapper.insertBatchSomeColumn(list);
- }
+ companySolutionJoinMapper.insert(list);
+ }*/
+
+
+
+
+
@@ -335,7 +502,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"淇濋櫓鏂规銆�"+s.getName()+"銆戝凡琚鐢紝涓嶈兘杩涜璇ユ搷浣�");
}
}
- companySolutionJoinMapper.insertBatchSomeColumn(list);
+ companySolutionJoinMapper.insert(list);
}*/
private void isValidCreateParam(Company company) {
if(StringUtils.isBlank(company.getPhone())
@@ -350,8 +517,8 @@
||StringUtils.isBlank(company.getEmail())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
-
- if(!debugModel){
+ String phoneAtuh = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_PHONE_AUTH).getCode();
+ if(!debugModel && !StringUtils.equals(phoneAtuh,Constants.ONE+"")){
//鎵嬫満楠岃瘉鐮佹牎楠�
SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
}
@@ -366,19 +533,19 @@
}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(),"璇蜂笂浼犺韩浠借瘉鎵弿浠讹紒");
}
- multifileMapper.insertBatchSomeColumn(multifileList);
+ multifileMapper.insert(multifileList);
}
private void dealFileDataForUpdate(Company company ) {
@@ -419,7 +586,7 @@
.eq(Multifile::getIsdeleted,Constants.ZERO)
.in(Multifile::getObjType,objList)
);
- multifileMapper.insertBatchSomeColumn(multifileList);
+ multifileMapper.insert(multifileList);
}
}
@@ -470,7 +637,8 @@
|| StringUtils.isBlank(company.getCaptche())){
throw new BusinessException(ResponseStatus.BAD_REQUEST );
}
- if(!debugModel){
+ String phoneAtuh = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_PHONE_AUTH).getCode();
+ if(!debugModel && !StringUtils.equals(phoneAtuh,Constants.ONE+"")){
SmsEmailServiceImpl.isCaptcheValide(smsEmailMapper,company.getPhone(),company.getCaptche());
}
Company model = companyMapper.selectById(company.getId());
@@ -534,9 +702,10 @@
if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
.ne(Company::getId,company.getId())
+ .eq(Company::getIsdeleted,Constants.ZERO)
.and(w->w.eq(Company::getCode,company.getCode())
.or().eq(Company::getEmail,company.getEmail())
- .or().eq(Company::getUsername,company.getUsername())
+// .or().eq(Company::getUsername,company.getUsername())
.or().eq(Company::getName,company.getName()))
)>0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇ヤ紒涓氥�愬悕绉般�戙�愮粺涓�淇＄敤浠ｇ爜銆戙�愰偖绠便�戞垨鑰呫�愪紒涓氳处鍙枫�戝凡瀛樺湪锛岃纭鍚庨噸鏂版彁浜わ紒");
@@ -575,6 +744,7 @@
company.setCreateDate(update.getEditDate());
if(StringUtils.isNotBlank(company.getUsername())){
//澶勭悊鐧婚檰璐﹀彿淇℃伅
+ company.setType(model.getType());
dealSystemUserDataForUpdate(company,model.getUsername());
}
@@ -783,23 +953,41 @@
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());
+ }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);
}
+
+ @Override
+ public List<Company> findAllCompanyList() {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ List<Company> companyList = companyMapper.selectList(
+ new QueryWrapper<Company>().lambda()
+ .eq(Company::getIsdeleted,Constants.ZERO)
+ .eq(Company::getType,Constants.ZERO)
+ .ne(Constants.equalsInteger(user.getType(),Constants.ONE),Company::getId,user.getCompanyId())
+ );
+ return companyList;
+ }
+
@Override
public PageData<Company> findPage(PageWrap<Company> pageWrap) {
@@ -808,23 +996,29 @@
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());
}
@@ -864,7 +1058,7 @@
queryWrapper.lambda().eq(Company::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getUsername() != null) {
- queryWrapper.lambda().eq(Company::getUsername, pageWrap.getModel().getUsername());
+ queryWrapper.lambda().like(Company::getUsername, pageWrap.getModel().getUsername());
}
if (pageWrap.getModel().getTaxCode() != null) {
queryWrapper.lambda().eq(Company::getTaxCode, pageWrap.getModel().getTaxCode());
@@ -885,7 +1079,7 @@
queryWrapper.lambda().eq(Company::getInvoiceAddr, pageWrap.getModel().getInvoiceAddr());
}
if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().eq(Company::getPhone, pageWrap.getModel().getPhone());
+ queryWrapper.lambda().like(Company::getPhone, pageWrap.getModel().getPhone());
}
if (pageWrap.getModel().getEmail() != null) {
queryWrapper.lambda().eq(Company::getEmail, pageWrap.getModel().getEmail());
--
Gitblit v1.9.3