From ef5d5889e1735a0df8b76e46d4b04fc5c9d818ea Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Tue, 14 Mar 2023 17:55:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=92=8C=E8=A7=92=E8=89=B2=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83=E6=96=B0=E5=A2=9E=E6=97=B6?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarBussStandAttrInfoExecl.java | 4 +- .../SarBussionessStandController.java | 6 +- .../service/ISarBussionessStandService.java | 2 +- .../impl/SarBussionessStandServiceImpl.java | 118 +++--------------- .../adc/da/slrs/sarRole/dao/TsRoleDao.java | 5 + .../service/impl/TsRoleServiceImpl.java | 6 + .../tsRoleMeunData/dao/TsRoleMenuDataDao.java | 4 + .../zlTree/controller/ZlTreeController.java | 2 + .../com/adc/da/slrs/zlTree/dao/ZlTreeDao.java | 5 + .../slrs/zlTree/service/IZlTreeService.java | 3 + .../service/impl/ZlTreeServiceImpl.java | 27 ++++ 11 files changed, 70 insertions(+), 112 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java index 581a256c..5484e59d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandAttrInfo/entity/SarBussStandAttrInfoExecl.java @@ -106,7 +106,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String qcrbuss; //发布日期 - private Date issueTime; + private String issueTime; //标准编号 private String standCode; @@ -115,7 +115,7 @@ public class SarBussStandAttrInfoExecl extends BaseEntity { private String standEnName; //实施日期 - private Date putTime; + private String putTime; //企标制修订状态 private String revisionStatus; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index 8f2f6dfb..85b4a416 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -418,12 +418,8 @@ public class SarBussionessStandController extends BaseController importSarBussionessStandFile(@RequestParam(value = "file",required = false)MultipartFile file) throws Exception{ - ResponseMessage message = sarBussionessStandEOService.importSarBussionessStandFile(file); - if (message != null && ! message.equals("")){ + sarBussionessStandEOService.importSarBussionessStandFile(file); return Result.success(); - }else { - return Result.error("导入失败,导入的文件为空"); - } } @ApiOperation(value = "|SarBussionessStand|判断原文译文") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java index a436dbfc..7b885edf 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -58,7 +58,7 @@ public interface ISarBussionessStandService extends IService ResponseMessage emptyFileAnewStorage(); - ResponseMessage importSarBussionessStandFile(MultipartFile file); + ResponseMessage importSarBussionessStandFile(MultipartFile file)throws Exception; ResponseMessage repetitionFile(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 1277e504..a998a415 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -2018,7 +2018,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl importSarBussionessStandFile(MultipartFile file) { + public ResponseMessage importSarBussionessStandFile(MultipartFile file)throws Exception { //给出头部信息 String[] headerExcel = {"企标编号,中文名称,英文名称,文本状态,发布日期,企标实施日期,企标制修订状态,起草部门,废止日期,代替企标编号,复审日期,起草人,被代替企标编号,采用标准,文件上传人员,采标程度,引用标准,适用车型,能源类型,适用产品线,上传时间,体系类别,备案日期,关联模块-乘用车VPPS编码,关联模块--乘用车vpps中文名称,关联模块--卡车VPPS编码,关联模块--卡车vpps中文名称,附件,企标类型,标准年份,"}; @@ -2043,7 +2043,7 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attInfoMap = new HashMap<>(); List jsonArray = new ArrayList<>(); @@ -2398,9 +2363,6 @@ public class SarBussionessStandServiceImpl extends ServiceImpl lawsList = iSarBussionessStandService.selectStandardsByStandNumber(standCode); -// if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "INLAND".equals(sarStandardsInfoEO.getStandType())) { -// sarStandardsInfoEO.setMenuId("64df1d5522bb49c09af2"); -// sarStandardsInfoEO.setCountry("CN"); -// } else if (StringUtils.isBlank(sarStandardsInfoEO.getMenuId()) && "FOREIGN".equals(sarStandardsInfoEO.getStandType())) { -// sarStandardsInfoEO.setMenuId("22179d54d4e640098e29"); -// } + //此处判断是否是带入的标准 if(StringUtils.isNotBlank(sarBussionessStand.getId())) { bussId = sarBussionessStand.getId(); @@ -2432,29 +2389,13 @@ public class SarBussionessStandServiceImpl extends ServiceImpl attrInfoMap = query.getAttrInfoMap(); if(attInfoMap!=null && !attInfoMap.isEmpty()){ -// updateStandFileFieldData(attInfoMap,attrInfoMap); resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue); sarBussionessStand.setSarStandAttrEOStr(resData); } - // 查询原相关流程 -// String relatePro = sarBussStandAttrInfoService.selectFieldValByStandId("XGLC",sarBussionessStand.getId()); -// if (StringUtils.isNotBlank(relatePro)) { -// String[] processSplit = relatePro.split(","); -// Set processSet = new HashSet<>(); -// for(String sData:processSplit){ -// processSet.add(sData); -// } -// //processSet.add(prcNum); -// relatePro = StringUtils.join(processSet.toArray(), ","); -// }// else { -// relatePro = prcNum; -// } + // 编辑标准 iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); - // 编辑相关流程 - // sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",relatePro); - // String content = "新增一条相关流程:" +standName; - // sarUpdLogEOService.createBaseProcessLog(sarBussionessStand.getId(),"BUSINESS",content,standName); + }else if (lawsList != null && !lawsList.isEmpty()) {//Id不存在，但是标准号存在的情况 String standId = lawsList.get(0).getId(); bussId = lawsList.get(0).getId(); @@ -2467,57 +2408,26 @@ public class SarBussionessStandServiceImpl extends ServiceImpl processSet = new HashSet<>(); -// for(String sData:processSplit){ -// processSet.add(sData); -// } -// //processSet.add(prcNum); -// relatePro = StringUtils.join(processSet.toArray(), ","); -// }// else { -// relatePro = prcNum; -// } + // 编辑标准 sarBussionessStand.setId(standId); iSarBussionessStandService.updateSarBussionessStand(sarBussionessStand); - // 编辑相关流程 -// sarBussStandAttrInfoService.updateStandInfo(standId,"XGLC",relatePro); -// String content = "新增一条相关流程:" +standName; -// sarUpdLogEOService.createBaseProcessLog(standId,"BUSINESS",content,standName); + } else {//标准号、ID都不存在的情况 // 新增方法 sarBussionessStand.setStandCode(standCode); +// sarBussionessStand.setStandNumber(""); +// sarBussionessStand.setStandSn(""); +// sarBussionessStand.setReviseStatus(""); ResponseMessage responseMessage = iSarBussionessStandService.createSarBussionessStand(sarBussionessStand); if(responseMessage.isOk()){ SarBussionessStand bussionessStand = responseMessage.getData(); bussId = bussionessStand.getId() == null ? "":bussionessStand.getId(); } - - // 编辑相关流程 - //sarBussStandAttrInfoService.updateStandInfo(sarBussionessStand.getId(),"XGLC",standName); } - List allItems = new ArrayList<>(); - //开始处理条款数据，从去重后的结果中直接处理即可 -// if(itemData!=null && !itemData.isEmpty()){ -// // allItems = -// saveStandItemsData(itemData, sarStandardsInfoEO); -// } - //技术评估结果入库 重构技术评估结果入库内容 -// if ("0".equals(isJudge)) { -// saveCompStatusInfo(sarStandardsInfoEO,breakVal,allItems,prcNum); -// } - -// List evaluationHisFilter = workFlowFeignClient.evaluationHisList(pid); List evaluationHis = new ArrayList<>(); Map> listMap = new TreeMap<>(); - // 按 相同数据分组 -// listMap = evaluationHisFilter.stream().collect( -// Collectors.groupingBy(a -> Utils.format("{0}#{1}#{2}", a.getPId(),a.getTaskInfo(),a.getUserId()))); - List evaluations = new ArrayList<>(); if(!listMap.isEmpty()){ SimpleDateFormat sdf=new SimpleDateFormat("yyy-MM-dd HH:mm:ss"); @@ -2613,8 +2523,8 @@ public class SarBussionessStandServiceImpl extends ServiceImpl dicInfo = dicTypeEODao.getDicInfo("dic_type_code", "dic_type_name"); Map dicMap = dicInfo.stream() - .filter(item-> !item.getDicTypeCode().isEmpty()) - .collect(Collectors.toMap(DicTypeEO::getDicTypeCode,DicTypeEO::getDicTypeName,(value1, value2 )->value2)); + .filter(item-> !item.getDicTypeName().isEmpty()) + .collect(Collectors.toMap(DicTypeEO::getDicTypeName,DicTypeEO::getDicTypeCode,(value1, value2 )->value2)); for(SarBussStandAttrInfoExecl row : sarlist){ attrInfoDetailsImport(row); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index 1e10c1ac..c0cf74e5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarRole.dao; import com.adc.da.slrs.sarRole.entity.TsRole; +import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; @@ -105,4 +106,8 @@ public interface TsRoleDao extends BaseMapper { @Select("select ROLE_ID from ts_user_role where USER_ID = #{userId}") List getRoleByUserId(@Param("userId") String userId); + + @Select("select role_id from ts_role_resource where resource_id =#{oldResourceIds}") + List getResourceId(String oldResourceIds); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java index 93586a44..fc70a78d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/impl/TsRoleServiceImpl.java @@ -14,6 +14,8 @@ import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.adc.da.slrs.sarRole.enums.MenuEnum; import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.zlTree.dao.ZlTreeDao; +import com.adc.da.slrs.zlTree.entity.ZlTree; import com.adc.da.utils.util.ListUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -24,6 +26,7 @@ import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -46,6 +49,9 @@ public class TsRoleServiceImpl extends ServiceImpl implements @Lazy private ISarUserPersonalMenuService sarUserPersonalMenuService; + @Autowired + private ZlTreeDao zlTreeDao; + @Autowired private ITsResourceService tsResourceService; /** diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java index c1331443..b7ee9949 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java @@ -2,6 +2,8 @@ package com.adc.da.slrs.tsRoleMeunData.dao; import com.adc.da.slrs.tsRoleMeunData.entity.TsRoleMenuData; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Param; /** *

@@ -13,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface TsRoleMenuDataDao extends BaseMapper { + @Insert("insert into ts_role_menu_data (role_id,menu_id) values (#{roleId},#{id})") + void save(@Param("roleId") String roleId,@Param("id") String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java index b5eca3ec..af8f2dda 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/controller/ZlTreeController.java @@ -46,6 +46,8 @@ public class ZlTreeController extends BaseController { public ResponseMessage addFileMaterial(@RequestBody ZlTree material){ material.setId(String.valueOf(UUID.randomUUID())); boolean save = iZlTreeService.save(material); + //新增后给所有角色配置权限 + iZlTreeService.setResource(material); return Result.success(save); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java index e7527d15..91971be7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/dao/ZlTreeDao.java @@ -2,7 +2,11 @@ package com.adc.da.slrs.zlTree.dao; import com.adc.da.slrs.zlTree.entity.ZlTree; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** *

@@ -16,4 +20,5 @@ public interface ZlTreeDao extends BaseMapper { int topping(@Param("id") String id); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java index e37b374c..6e9ef9f5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/IZlTreeService.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.zlTree.service; +import com.adc.da.http.ResponseMessage; import com.adc.da.slrs.zlTree.entity.TreeData; import com.adc.da.slrs.zlTree.entity.ZlTree; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -54,4 +55,6 @@ public interface IZlTreeService extends IService { ZlTree queryTree(String treeId); void subordinateTreeNodes(List treeIds,String parentTreeId); + + void setResource(ZlTree material); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java index 4d9a6e88..6784de4f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/zlTree/service/impl/ZlTreeServiceImpl.java @@ -1,9 +1,15 @@ package com.adc.da.slrs.zlTree.service.impl; +import com.adc.da.http.ResponseMessage; +import com.adc.da.http.Result; import com.adc.da.slrs.sarPosition.service.ITsPositionService; +import com.adc.da.slrs.sarRole.dao.TsRoleDao; +import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.adc.da.slrs.sarRole.service.ITsRoleService; import com.adc.da.slrs.sarUser.dao.TsUserDao; import com.adc.da.slrs.sarUser.service.ITsUserService; +import com.adc.da.slrs.tsRoleMeunData.dao.TsRoleMenuDataDao; +import com.adc.da.slrs.tsRoleMeunData.service.impl.TsRoleMenuDataServiceImpl; import com.adc.da.slrs.zlTree.dao.ZlTreeDao; import com.adc.da.slrs.zlTree.entity.TreeData; import com.adc.da.slrs.zlTree.entity.ZlTree; @@ -40,6 +46,12 @@ public class ZlTreeServiceImpl extends ServiceImpl implements @Autowired private ITsUserService tsUserService; + @Autowired + private TsRoleDao tsRoleDao; + + @Autowired + TsRoleMenuDataDao tsRoleMenuDataDao; + @Override public List getLeftTree() { // 获取当前登录人 @@ -173,4 +185,19 @@ public class ZlTreeServiceImpl extends ServiceImpl implements } } } + + /** + * 新增后给所有角色配置权限 + * @param material + */ + @Override + public void setResource(ZlTree material) { + //获取pid + String pId = material.getParentId(); + List roleIds = tsRoleDao.getResourceId(pId); + for (String roleId : roleIds){ + tsRoleDao.addResource(roleId,material.getId()); + tsRoleMenuDataDao.save(roleId,material.getId()); + } + } } From 57e01dff1024371aa0045384b416728262a48c23 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 15 Mar 2023 12:08:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=94=B6=E8=97=8F?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/person/controller/PersonCollectEOController.java | 4 ++-- .../com/adc/da/person/service/IPersonCollectEOService.java | 2 +- .../da/person/service/impl/PersonCollectEOServiceImpl.java | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java index 2e91e397..1601197f 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/controller/PersonCollectEOController.java @@ -43,10 +43,10 @@ public class PersonCollectEOController extends BaseController { **/ @ApiOperation(value = "|PersonCollectEO|分页查询") @GetMapping("/page") - public ResponseMessage> page(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId) throws Exception { + public ResponseMessage> page(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId,Integer validFlag) throws Exception { - return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,modeType,userId); + return personCollectEOService.queryCollectByWrapper(pageNo, pageSize,collectTitle,modeType,userId,validFlag); } diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java index a68eefaf..ae505a87 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/IPersonCollectEOService.java @@ -28,7 +28,7 @@ public interface IPersonCollectEOService extends IService { int updateByPrimaryKeySelective(TsPersonCollect tsPersonCollect) throws Exception; - public ResponseMessage> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle,String modeType, String userId); + public ResponseMessage> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle,String modeType, String userId,Integer validFlag); /** * 通过标准号和用户id查询是否收藏此标准 diff --git a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java index dd05be89..5b021183 100644 --- a/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/person/service/impl/PersonCollectEOServiceImpl.java @@ -133,7 +133,7 @@ public class PersonCollectEOServiceImpl extends ServiceImpl> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId) { + public ResponseMessage> queryCollectByWrapper(Integer pageNo, Integer pageSize, String collectTitle, String modeType,String userId,Integer validFlag) { BasePage basePage = new BasePage(); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq("user_id",userId); @@ -144,6 +144,11 @@ public class PersonCollectEOServiceImpl extends ServiceImpl ids = new ArrayList<>(Arrays.asList(modeType.split(","))); wrapper.in("collect_type",ids); } + if (validFlag != null && !validFlag.equals("") && validFlag == 0){ + wrapper.eq("valid_flag",validFlag); + }else if (validFlag != null && !validFlag.equals("") && validFlag == 1){ + wrapper.eq("valid_flag",validFlag); + } wrapper.orderByDesc("creation_Time"); if (pageNo != null) {