From 7c5484cc1169aa6ef55c77c70f136a781469a7c3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 06 一月 2025 17:01:01 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java | 35 ++++++++++++++++++++---------------
1 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
index a81e0ef..67cda58 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerParamServiceImpl.java
@@ -1,30 +1,24 @@
package com.doumee.service.business.impl;
-import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
-import com.doumee.core.utils.SmsConstants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.HiddenDangerParamMapper;
-import com.doumee.dao.business.MemberMapper;
-import com.doumee.dao.business.SmsConfigMapper;
-import com.doumee.dao.business.SmsEmailMapper;
+import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.HiddenDangerParamService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.doumee.service.business.third.EmayService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -59,12 +53,16 @@
}
if(Constants.equalsInteger(model.getType(),Constants.ZERO)){
//濡傛灉鏄尯鍩熼厤缃�
+ if(model.getCompanyId() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨璐ｄ换閮ㄩ棬锛�");
+ }
List<Integer> ids = model.getMemberIdList();
if(ids==null || ids.size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀹夊叏鍛樹俊鎭笉姝ｇ‘锛岃鎸夎姹傚～鍐欏唴瀹癸紒");
}
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
- .eq(Member::getType,Constants.TWO)
+// .eq(Member::getType,Constants.TWO)
+ .eq(Member::getCompanyId,model.getCompanyId())
.in(Member::getId,ids)
.eq(Member::getIsdeleted,Constants.ZERO));
if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
@@ -142,12 +140,16 @@
}
if(Constants.equalsInteger(hiddenDangerParam.getType(),Constants.ZERO)){
//濡傛灉鏄尯鍩熼厤缃�,鏍￠獙瀹夊叏鍛樹俊鎭槸鍚︽纭�
+ if(model.getCompanyId() == null){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇烽�夋嫨璐ｄ换閮ㄩ棬锛�");
+ }
List<Integer> ids =model.getMemberIdList();
if(ids==null || ids.size() ==0){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝瀹夊叏鍛樹俊鎭笉姝ｇ‘锛岃鎸夎姹傚～鍐欏唴瀹癸紒");
}
List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
.eq(Member::getType,Constants.TWO)
+ .eq(Member::getCompanyId,model.getCompanyId())
.in(Member::getId,ids)
.eq(Member::getIsdeleted,Constants.ZERO));
if(memberList == null || memberList.size() == 0 || memberList.size() != ids.size() ){
@@ -208,15 +210,18 @@
@Override
public PageData<HiddenDangerParam> findPage(PageWrap<HiddenDangerParam> pageWrap) {
IPage<HiddenDangerParam> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<HiddenDangerParam> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<HiddenDangerParam> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
pageWrap.getModel().setIsdeleted(Constants.ZERO);
- queryWrapper.lambda()
+ queryWrapper. selectAll(HiddenDangerParam.class)
+ .selectAs(Company::getCompanyNamePath,HiddenDangerParam::getCompanyName)
+ .leftJoin(Company.class,Company::getId,HiddenDangerParam::getCompanyId)
.eq(pageWrap.getModel().getId() != null, HiddenDangerParam::getId, pageWrap.getModel().getId())
.eq(pageWrap.getModel().getCreator() != null, HiddenDangerParam::getCreator, pageWrap.getModel().getCreator())
.eq(pageWrap.getModel().getEditor() != null, HiddenDangerParam::getEditor, pageWrap.getModel().getEditor())
.eq(pageWrap.getModel().getIsdeleted() != null, HiddenDangerParam::getIsdeleted, pageWrap.getModel().getIsdeleted())
.like(pageWrap.getModel().getName() != null, HiddenDangerParam::getName, pageWrap.getModel().getName())
+ .like(pageWrap.getModel().getCompanyName() != null, Company::getName, pageWrap.getModel().getCompanyName())
.eq(pageWrap.getModel().getRemark() != null, HiddenDangerParam::getRemark, pageWrap.getModel().getRemark())
.eq(pageWrap.getModel().getStatus() != null, HiddenDangerParam::getStatus, pageWrap.getModel().getStatus())
.eq(pageWrap.getModel().getSortnum() != null, HiddenDangerParam::getSortnum, pageWrap.getModel().getSortnum())
@@ -235,7 +240,7 @@
queryWrapper.orderByAsc(sortData.getProperty());
}
}
- PageData<HiddenDangerParam> result = PageData.from(hiddenDangerParamMapper.selectPage(page, queryWrapper));
+ PageData<HiddenDangerParam> result = PageData.from(hiddenDangerParamMapper.selectJoinPage(page,HiddenDangerParam.class, queryWrapper));
return result;
}
--
Gitblit v1.9.3