测试 事项查询

base-manager/src/main/java/com/mortals/xhx/busiz/web/DemoWebApiController.java

@@ -232,9 +232,9 @@ public class DemoWebApiController {
 
         ParamDto param = new ParamDto();
         param.getCondition().put("areaCode", matterQuery.getAreaCode());
-        if (!ObjectUtils.isEmpty(matterQuery.getSource())) {
-            param.getCondition().put("source", matterQuery.getSource());
-        }
+
+        param.getCondition().put("source", matterQuery.getSource());
+
         int count = matterService.getDao().getMatterListByAreaCodeCount(param);
         log.info("本地事项总数：{}", count);
         ArrayList<MatterEntity> allList = new ArrayList<>();

base-manager/src/main/java/com/mortals/xhx/module/matter/dao/ibatis/MatterDaoImpl.java

@@ -77,9 +77,9 @@ public class MatterDaoImpl extends BaseCRUDDaoMybatis<MatterEntity, Long> implem
         Result<MatterEntity> result = new Result();
         ParamDto param = new ParamDto();
         param.getCondition().put("areaCode", matterQuery.getAreaCode());
-        if (!ObjectUtils.isEmpty(matterQuery.getSource())) {
-            param.getCondition().put("source", matterQuery.getSource());
-        }
+
+        param.getCondition().put("source", matterQuery.getSource());
+
         RowBounds rowBounds = new RowBounds(pageInfo.getBeginIndex(), pageInfo.getPrePageResult());
         List<MatterEntity> list = this.getSqlSession().selectList(this.getSqlId(SQLID_MATTERLIST_AREACODE), param, rowBounds);
 

base-manager/src/main/resources/sqlmap/module/matter/MatterMapperExt.xml

@@ -103,12 +103,11 @@
             <if test="condition.areaCode!=null and condition.areaCode!=''">
                 and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
             </if>
-        </trim>
-
-        <if test="condition.source!=null and condition.source!=''">
-            and a.source = #{condition.source,jdbcType=INTEGER}
-        </if>
 
+            <if test="condition.source!=null">
+                and a.source = #{condition.source,jdbcType=INTEGER}
+            </if>
+        </trim>
     </select>
 
 </mapper>
\ No newline at end of file