From bd6b08e65fe29994c6c6b5430639022f2a4f5e5c Mon Sep 17 00:00:00 2001
From: wenminjie <1036699586@qq.com>
Date: 星期二, 14 七月 2026 11:48:08 +0800
Subject: [PATCH] 修复了已知的BUG
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTrainLibraryController.java | 78 +++++++++++++++++++++++---------------
1 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTrainLibraryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTrainLibraryController.java
index cb597d4..ca18284 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTrainLibraryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTrainLibraryController.java
@@ -2,7 +2,10 @@
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
@@ -114,35 +117,32 @@
SysUser sysUser = sysUserService.selectUserById(userId);
TTrainLibraryQuery query = JSON.parseObject(param, TTrainLibraryQuery.class);
if (sysUser.getRoleType().equals("2")){
- List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
- .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
- if (!allProjectIds.isEmpty()){ List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds)
- .list().stream().map(TProjectTeam::getId).collect(Collectors.toList());
-
- if (projectIds.isEmpty()){
- return R.ok(new PageInfo<>());
- }
- query.setProjectIds(projectIds);
- }else {
- return R.ok(new PageInfo<>());
+ if (CollectionUtils.isNotEmpty(query.getProjectIds())) {
+ query.setProjectIds(query.getProjectIds());
}
}else if (!sysUser.getRoleType().equals("1")){
- List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
- .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
- if (!allProjectIds.isEmpty()){
- List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds)
- .eq(TProjectTeam::getStatus, 1).list().stream().map(TProjectTeam::getId).collect(Collectors.toList());
+ if (CollectionUtils.isNotEmpty(query.getProjectIds())) {
+ query.setProjectIds(query.getProjectIds());
+ }else {
+ // 没有根据项目组查询
+ List<String> allProjectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
+ .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
+ if (!allProjectIds.isEmpty()){
+ List<String> projectIds = projectTeamService.lambdaQuery().in(TProjectTeam::getId, allProjectIds)
+ .eq(TProjectTeam::getStatus, 1).list().stream().map(TProjectTeam::getId).collect(Collectors.toList());
- if (projectIds.isEmpty()){
+ if (projectIds.isEmpty()){
+ return R.ok(new PageInfo<>());
+ }
+ query.setProjectIds(projectIds);
+ }else {
return R.ok(new PageInfo<>());
}
- query.setProjectIds(projectIds);
- }else {
- return R.ok(new PageInfo<>());
}
}
- return R.ok(tTrainLibraryService.pageList(query));
+ return R.ok(tTrainLibraryService.pageList(query, sysUser.getRoleType()));
}
+
/**
* 获取菌种库出入库时间轴列表
*/
@@ -183,15 +183,17 @@
return R.fail(401,"登陆失效");
}
TTrainLibraryDTO dto = JSON.parseObject(param,TTrainLibraryDTO.class);
- List<String> projectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
- .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
- if (!projectIds.isEmpty()){
- TProjectTeam projectTeam = projectTeamService.lambdaQuery().in(TProjectTeam::getId, projectIds)
- .eq(TProjectTeam::getStatus, 1)
- .orderByDesc(BaseModel::getCreateTime)
- .last("limit 1").one();
- dto.setProjectId(projectTeam.getId());
- }
+
+ //改为前端传值
+// List<String> projectIds = projectTeamStaffService.lambdaQuery().eq(TProjectTeamStaff::getUserId, tokenService.getLoginUser().getUserId())
+// .list().stream().map(TProjectTeamStaff::getTeamId).collect(Collectors.toList());
+// if (!projectIds.isEmpty()){
+// TProjectTeam projectTeam = projectTeamService.lambdaQuery().in(TProjectTeam::getId, projectIds)
+// .eq(TProjectTeam::getStatus, 1)
+// .orderByDesc(BaseModel::getCreateTime)
+// .last("limit 1").one();
+// dto.setProjectId(projectTeam.getId());
+// }
tTrainLibraryService.save(dto);
if (dto.getIsDraft()==0){
// 新增入库记录
@@ -236,6 +238,20 @@
noticeService.save(tNotice);
}
return R.ok();
+ }
+
+ public static void main(String[] args) {
+// String jsonStr = "[{\"id\":1,\"num1\":\"00:00\",\"num2\":\"19:00\",\"num3\":1,\"num4\":1,\"num5\":1,\"num6\":1,\"num7\":1}]";
+// JSONArray startingFareJsonArray = JSONArray.parseArray(jsonStr);
+// for (int i = 0; i < startingFareJsonArray.size(); i++) {
+// JSONObject jsonObject = startingFareJsonArray.getJSONObject(i);
+// System.out.println(jsonObject.getString("num1"));
+// System.out.println(jsonObject.getString("num2"));
+// System.out.println(jsonObject.getInteger("num3"));
+// }
+ Long temp =2027571910897541122L;
+ System.out.println(temp%20);
+
}
/**
* 新增菌种库
@@ -327,7 +343,7 @@
}
TTrainLibraryDTO dto = JSON.parseObject(param,TTrainLibraryDTO.class);
tTrainLibraryService.updateById(dto);
- if (dto.getIsDraft()==0){
+ if (dto.getIsDraft()==0) {
List<TTrainLibraryWarehousing> list = tTrainLibraryWarehousingService.lambdaQuery().eq(TTrainLibraryWarehousing::getTrainLibraryId, dto.getId()).list();
if (list.isEmpty()){
// 新增入库记录
--
Gitblit v1.7.1