添加站点事项过滤

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterServiceImpl.java

@@ -200,6 +200,8 @@ public class MatterServiceImpl extends AbstractCRUDCacheServiceImpl<MatterDao, M
 
     @Override
     public Result<MatterEntity> findSubList(MatterEntity matterQuery, PageInfo pageInfo, Context context) throws AppException {
+        SiteEntity siteCache = siteService.getCache(matterQuery.getSiteId().toString());
+        matterQuery.setAreaCode(siteCache==null?null:siteCache.getAreaCode());
         return this.dao.getSubList(matterQuery, pageInfo);
     }
 

base-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterController.java

@@ -155,7 +155,6 @@ public class MatterController extends BaseCRUDJsonBodyMappingController<MatterSe
         this.init(model, context);
         ret.setCode(code);
         ret.setData(model);
-        ret.setDict(model.get(KEY_RESULT_DICT));
         ret.setMsg(model.get(MESSAGE_INFO) == null ? "" : model.remove(MESSAGE_INFO).toString());
         return ret;
     }

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

@@ -13,7 +13,15 @@
         <trim suffixOverrides="where" suffix="">
             where b.matterCode IS NULL
             <trim prefixOverrides="and" prefix="">
-                <include refid="_condition_"/>
+                <if test="condition.areaCode!=null and condition.areaCode!=''">
+                    and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.deptCode!=null and condition.deptCode!=''">
+                    and a.deptCode = #{condition.deptCode,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.matterName != null and condition.matterName != ''">
+                    a.matterName like #{condition.matterName}
+                </if>
             </trim>
         </trim>
     </select>
@@ -28,7 +36,15 @@
         <trim suffixOverrides="where" suffix="">
             where b.matterCode IS NULL
             <trim prefixOverrides="and" prefix="">
-                <include refid="_condition_"/>
+                <if test="condition.areaCode!=null and condition.areaCode!=''">
+                    and a.areaCode = #{condition.areaCode,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.deptCode!=null and condition.deptCode!=''">
+                    and a.deptCode = #{condition.deptCode,jdbcType=VARCHAR}
+                </if>
+                <if test="condition.matterName != null and condition.matterName != ''">
+                     a.matterName like #{condition.matterName}
+                </if>
             </trim>
         </trim>
     </select>