Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

字段修改

Browse Source
This commit is contained in:
yangsb
2024-03-29 15:01:40 +08:00
parent ca1994644d
commit 29e1bbaae7
11 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/dal/mysql/machinetemplate/MachineTemplateMapper.java
+1 -1
View File
@@ -26,7 +26,7 @@ public interface MachineTemplateMapper extends BaseMapperX<MachineTemplateDO> {
default PageResult<MachineTemplateDO> selectPage(MachinePageReqVO reqVO, Collection<Long> ids) {
return selectPage(reqVO, new LambdaQueryWrapperX<MachineTemplateDO>()
.eqIfPresent(MachineTemplateDO::getMachineType, reqVO.getMachineType())
.inIfPresent(MachineTemplateDO::getId, ids)
//.inIfPresent(MachineTemplateDO::getId, ids)
.likeIfPresent(MachineTemplateDO::getName, reqVO.getName())
.betweenIfPresent(MachineTemplateDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(MachineTemplateDO::getCreateTime));
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineTemplateServiceImpl.java
+3 -3
View File
@@ -361,15 +361,15 @@ public class MachineTemplateServiceImpl implements MachineTemplateService {
@Override
public PageResult<MachineTemplateDO> page(MachinePageReqVO pageParam) {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
/* LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
List<Long> machineIds = userMachineMapper.selectList(new LambdaQueryWrapperX<UserMachineDO>().eq(UserMachineDO::getUserId, loginUser.getId()))
.stream()
.map(e -> e.getMachineId())
.collect(Collectors.toList());
if(CollectionUtil.isEmpty(machineIds)) {
return new PageResult<>();
}
return machineTemplateMapper.selectPage(pageParam, machineIds);
}*/
return machineTemplateMapper.selectPage(pageParam, new ArrayList<>());
}