Browse Source

字典查询缺少字段、邮件发送去掉部门筛选

liyuan 6 months ago
parent
commit
bc062d094d

+ 1 - 2
blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -6766,8 +6766,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (CollectionUtils.isEmpty(dictBizList)) {
 				return R.fail("请完善邮箱信息");
 			}
-			DictBiz dictBiz = dictBizList.stream().filter(db -> db.getTenantId().equals(bladeUser.getTenantId())
-				&& db.getIsDeleted() == 0 && db.getIsSealed() == 0).sorted(Comparator.comparingInt(DictBiz::getSort)).findFirst().orElse(null);
+			DictBiz dictBiz = dictBizList.stream().filter(db -> db.getTenantId().equals(bladeUser.getTenantId())).max(Comparator.comparingInt(DictBiz::getSort)).orElse(null);
 			if (dictBiz == null) {
 				return R.fail("请完善有效的邮箱信息");
 			}

+ 1 - 1
blade-service/blade-system/src/main/java/org/springblade/system/mapper/DictBizMapper.xml

@@ -38,7 +38,7 @@
     </select>-->
 
     <select id="getList" resultMap="dictResultMap">
-        select id, parent_id, code, dict_key, dict_value, sort, remark,colour from blade_dict_biz where code = #{param1} and parent_id > 0 and is_sealed = 0 and is_deleted = 0 ORDER BY sort
+        select id, parent_id ,tenant_id,  parent_id, code, dict_key, dict_value, sort, remark,colour from blade_dict_biz where code = #{param1} and parent_id > 0 and is_sealed = 0 and is_deleted = 0 ORDER BY sort
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">