@@ -1352,7 +1352,6 @@
<if test="internationalFlag != null ">
and a.international_flag = #{internationalFlag,jdbcType=INTEGER}
</if>
- and a.release_status = 1
and a.audit_status = 3
<if test="dateSort == 0">
order by order by ap.if_top,ap.top_number,ap.show_number,a.release_date asc
@@ -1399,15 +1398,8 @@
-
- <if test="dateSort == 0">
- order by a.release_date asc
- </if>
- <if test="dateSort == 1">
- order by a.release_date desc
+
</select>
<select id="selectAchievementSearchDetail" resultType="com.goafanti.portal.bo.AchievementDetailBo">
@@ -1078,7 +1078,6 @@
and d.budget_cost is null
and d.deleted_sign = 0
- and d.release_status = 1
and d.audit_status = 3
order by dp.if_top,dp.top_number,dp.show_number,d.release_date asc
@@ -1122,9 +1121,6 @@
<if test="sign == 1">
- and d.deleted_sign = 0
- and d.audit_status = 3
<select id="selectDemandSearchDetail" parameterType="java.lang.String" resultType="com.goafanti.portal.bo.DemandSearchDetailBo">
@@ -58,13 +58,17 @@ public class PortalSearchController extends BaseController {
if (StringUtils.isNumeric(pageNo)) {
pNo = Integer.parseInt(pageNo);
}
- try{
- new BigDecimal(upperPrice);
- new BigDecimal(lowerPrice);
- }catch (Exception e) {
- res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "金额"));
+ if (null!=upperPrice&&null!=lowerPrice) {
+ try{
+ new BigDecimal(upperPrice);
+ new BigDecimal(lowerPrice);
+ }catch (Exception e) {
+ res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "金额"));
+ return res;
+ }
Pagination<AchievementSearchListBo> achievementSearchList = achievementService.listAchievementSearchList(
keyword, dataCategory,category,fieldA, transferMode, pNo, pSize,dateSort,upperPrice,lowerPrice,internationalFlag);