diff --git a/ruoyi-modules/zjk-api/libs/bubichain-sdk-4.0.4.jar b/ruoyi-modules/zjk-api/libs/bubichain-sdk-4.0.4.jar
new file mode 100644
index 0000000000000000000000000000000000000000..f346a579924908cfa9345fb4863964a865e7759e
Binary files /dev/null and b/ruoyi-modules/zjk-api/libs/bubichain-sdk-4.0.4.jar differ
diff --git a/ruoyi-modules/zjk-api/pom.xml b/ruoyi-modules/zjk-api/pom.xml
index d9856c16d494fb93f02a994f27667935e66909f5..04d41fe2aa1d9343b77b104291505cca298e4af0 100644
--- a/ruoyi-modules/zjk-api/pom.xml
+++ b/ruoyi-modules/zjk-api/pom.xml
@@ -112,12 +112,9 @@
cn.bubi.sdk
bubichain-sdk
4.0.4
+ system
+ ${basedir}/libs/bubichain-sdk-4.0.4.jar
-
- cn.bubi.sdk
- bubichain-sdk
- 4.0.4
-
diff --git a/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningBackServiceImpl.java b/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningBackServiceImpl.java
index 6c7ac7e3e7066d3796c05219cf057a1fcc08ea8e..f4c53e8331bb170eca88105cbda3032660db9cb6 100644
--- a/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningBackServiceImpl.java
+++ b/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningBackServiceImpl.java
@@ -1,5 +1,6 @@
package org.dromara.zjk.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.IdUtil;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.utils.MapstructUtils;
@@ -12,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.zjk.domain.LearningEvaluate;
+import org.dromara.zjk.domain.LearningSuggest;
import org.dromara.zjk.mapper.ZjkExpertMapper;
import org.springframework.stereotype.Service;
import org.dromara.zjk.domain.bo.LearningBackBo;
@@ -64,7 +66,9 @@ public class LearningBackServiceImpl implements ILearningBackService {
LambdaQueryWrapper lqw = buildQueryWrapper(bo);
if(!StringUtils.isEmpty(bo.getExpertName())){
List uids = zjkExpertMapper.selectIdsByName(bo.getExpertName());
- lqw.in(LearningBack::getCreateBy, uids);
+ if(!CollectionUtil.isEmpty(uids)){
+ lqw.in(LearningBack::getCreateBy, uids);
+ }
}
lqw.orderByDesc(LearningBack::getCreateTime);
Page result = baseMapper.selectVoPage(pageQuery.build(), lqw);
diff --git a/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningEvaluateServiceImpl.java b/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningEvaluateServiceImpl.java
index b1b79a7ee82cffd7aa009289fe4afd433e534e76..496193fa8219e9b40c1cddc4168a3f3583566f8f 100644
--- a/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningEvaluateServiceImpl.java
+++ b/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningEvaluateServiceImpl.java
@@ -1,30 +1,29 @@
package org.dromara.zjk.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
import org.dromara.common.core.constant.TenantConstants;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.RequiredArgsConstructor;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
-import org.dromara.zjk.domain.LearningBack;
-import org.dromara.zjk.enums.ApprovalStatusEnum;
-import org.dromara.zjk.learning_world.mapper.ZjkLearningCourseMapper;
-import org.dromara.zjk.mapper.ZjkExpertMapper;
-import org.springframework.stereotype.Service;
+import org.dromara.zjk.domain.LearningEvaluate;
import org.dromara.zjk.domain.bo.LearningEvaluateBo;
import org.dromara.zjk.domain.vo.LearningEvaluateVo;
-import org.dromara.zjk.domain.LearningEvaluate;
+import org.dromara.zjk.learning_world.mapper.ZjkLearningCourseMapper;
import org.dromara.zjk.mapper.LearningEvaluateMapper;
+import org.dromara.zjk.mapper.ZjkExpertMapper;
import org.dromara.zjk.service.ILearningEvaluateService;
+import org.springframework.stereotype.Service;
+import java.util.Collection;
import java.util.List;
import java.util.Map;
-import java.util.Collection;
/**
* 【请填写功能名称】Service业务层处理
@@ -39,6 +38,7 @@ public class LearningEvaluateServiceImpl implements ILearningEvaluateService {
private final LearningEvaluateMapper baseMapper;
private final ZjkExpertMapper zjkExpertMapper;
private final ZjkLearningCourseMapper zjkLearningCourseMapper;
+
/**
* 查询【请填写功能名称】
*
@@ -46,9 +46,9 @@ public class LearningEvaluateServiceImpl implements ILearningEvaluateService {
* @return 【请填写功能名称】
*/
@Override
- public LearningEvaluateVo queryById(String ID){
+ public LearningEvaluateVo queryById(String ID) {
LearningEvaluateVo res = baseMapper.selectVoById(ID);
- if(res.getCourseId()!=null){
+ if (res.getCourseId() != null) {
res.setCourseName(zjkLearningCourseMapper.selectById(res.getCourseId()).getCourseName());
}
return res;
@@ -68,17 +68,21 @@ public class LearningEvaluateServiceImpl implements ILearningEvaluateService {
if (contains) {
lqw.in(LearningEvaluate::getCreateBy, LoginHelper.getUserId());
}
- if(!StringUtils.isEmpty(bo.getExpertName())){
+ if (!StringUtils.isEmpty(bo.getExpertName())) {
List uids = zjkExpertMapper.selectIdsByName(bo.getExpertName());
- lqw.in(LearningEvaluate::getCreateBy, uids);
+ if (!CollectionUtil.isEmpty(uids)) {
+ lqw.in(LearningEvaluate::getCreateBy, uids);
+ }
}
- if(!StringUtils.isEmpty(bo.getCourseName())){
+ if (!StringUtils.isEmpty(bo.getCourseName())) {
List cids = zjkLearningCourseMapper.selectIdsByName(bo.getCourseName());
- lqw.in(LearningEvaluate::getCourseId, cids);
+ if (!CollectionUtil.isEmpty(cids)) {
+ lqw.in(LearningEvaluate::getCourseId, cids);
+ }
}
lqw.orderByDesc(LearningEvaluate::getCreateTime);
Page result = baseMapper.selectVoPage(pageQuery.build(), lqw);
- result.getRecords().stream().forEach(o ->{
+ result.getRecords().stream().forEach(o -> {
o.setExpertName(zjkExpertMapper.selectByUserId(o.getCreateBy()).getExpertName());
o.setCourseName(zjkLearningCourseMapper.selectById(o.getCourseId()).getCourseName());
});
@@ -145,7 +149,7 @@ public class LearningEvaluateServiceImpl implements ILearningEvaluateService {
/**
* 保存前的数据校验
*/
- private void validEntityBeforeSave(LearningEvaluate entity){
+ private void validEntityBeforeSave(LearningEvaluate entity) {
//TODO 做一些数据校验,如唯一约束
if (StringUtils.isBlank(entity.getID())) {
entity.setID(IdUtil.simpleUUID()); // 或使用其他ID生成方式
@@ -161,7 +165,7 @@ public class LearningEvaluateServiceImpl implements ILearningEvaluateService {
*/
@Override
public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) {
- if(isValid){
+ if (isValid) {
//TODO 做一些业务上的校验,判断是否需要校验
}
return baseMapper.deleteByIds(ids) > 0;
diff --git a/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningSuggestServiceImpl.java b/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningSuggestServiceImpl.java
index f34e086fa696de216a743ff7b26c063eb08622d3..c9303417c283329434ae63e3e27c18f7720e81fb 100644
--- a/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningSuggestServiceImpl.java
+++ b/ruoyi-modules/zjk-api/src/main/java/org/dromara/zjk/service/impl/LearningSuggestServiceImpl.java
@@ -1,5 +1,6 @@
package org.dromara.zjk.service.impl;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.IdUtil;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StringUtils;
@@ -62,7 +63,9 @@ public class LearningSuggestServiceImpl implements ILearningSuggestService {
LambdaQueryWrapper lqw = buildQueryWrapper(bo);
if(!StringUtils.isEmpty(bo.getExpertName())){
List uids = zjkExpertMapper.selectIdsByName(bo.getExpertName());
- lqw.in(LearningSuggest::getCreateBy, uids);
+ if(!CollectionUtil.isEmpty(uids)){
+ lqw.in(LearningSuggest::getCreateBy, uids);
+ }
}
Page result = baseMapper.selectVoPage(pageQuery.build(), lqw);
result.getRecords().stream().forEach(o ->{