ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 78396 标准选择--查询--来源为空，列表数据为空

Browse Source
This commit is contained in:
liao
2023-11-10 19:27:04 +08:00
parent 30af820173
commit 364da7ed77
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/mapper/xml/LawsCommonMapper.xml
+6 -5
View File
@@ -49,24 +49,24 @@
<select id="getManyStandardSelectionBox" <select id="getManyStandardSelectionBox"
resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox"> resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
SELECT id, standard_number, standard_name, release_date, standard_state, source SELECT id, standard_number, standard_name, release_date, standard_state, source, create_time
FROM FROM
(SELECT id, standard_number, standard_name, release_date, standard_state, '1' AS source (SELECT id, standard_number, standard_name, release_date, standard_state, '1' AS source, create_time
FROM laws_domestic_standard FROM laws_domestic_standard
WHERE del_flag = 0 WHERE del_flag = 0
UNION ALL UNION ALL
SELECT id, standard_number, standard_name, release_date, standard_state, '2' AS source SELECT id, standard_number, standard_name, release_date, standard_state, '2' AS source, create_time
FROM laws_overseas_standard FROM laws_overseas_standard
WHERE del_flag = 0 WHERE del_flag = 0
UNION ALL UNION ALL
SELECT id, standard_number, standard_name, release_date, standard_state, '3' AS source SELECT id, standard_number, standard_name, release_date, standard_state, '3' AS source, create_time
FROM laws_enterprise_standard FROM laws_enterprise_standard
WHERE del_flag = 0) standard WHERE del_flag = 0) standard
WHERE del_flag = 0 <where>
<if test="vo.source != null and vo.source != ''"> <if test="vo.source != null and vo.source != ''">
AND source = #{vo.source} AND source = #{vo.source}
</if> </if>
@@ -80,6 +80,7 @@
<if test="vo.excludeStandardNumbers != null and vo.excludeStandardNumbers != ''"> <if test="vo.excludeStandardNumbers != null and vo.excludeStandardNumbers != ''">
AND standard_number NOT LIKE CONCAT('%', #{vo.excludeStandardNumbers}, '%') AND standard_number NOT LIKE CONCAT('%', #{vo.excludeStandardNumbers}, '%')
</if> </if>
</where>
ORDER BY create_time DESC ORDER BY create_time DESC
</select> </select>
<select id="getSingleStandard" resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox"> <select id="getSingleStandard" resultType="com.jero.modules.laws.common.vo.ManyStandardSelectionBox">
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
-5
View File
@@ -1167,11 +1167,6 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
@Override @Override
public IPage<ManyStandardSelectionBox> getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize) { public IPage<ManyStandardSelectionBox> getManyStandardSelectionBox(ManyStandardSelectionBoxVO selectionBoxVO, Integer pageNo, Integer pageSize) {
Page<ManyStandardSelectionBox> page = new Page<>(pageNo, pageSize); Page<ManyStandardSelectionBox> page = new Page<>(pageNo, pageSize);
// 来源不能为空
if (StringUtils.isBlank(selectionBoxVO.getSource())) {
throw new JeroBootException(ResultCommon.EMPTY_SOURCE, "");
}
selectionBoxVO.setSource(TableNameEnum.getTableName(selectionBoxVO.getSource()));
return lawsCommonMapper.getManyStandardSelectionBox(page, selectionBoxVO); return lawsCommonMapper.getManyStandardSelectionBox(page, selectionBoxVO);
} }