diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java index e2e7136c..27e9b535 100644 --- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java +++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/topic/controller/TopicController.java @@ -77,9 +77,10 @@ public class TopicController extends JeecgController { public Result> queryPageList(Topic topic, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + HttpServletRequest req,@RequestParam(name="annualCompid",required=true) String annualCompid) { LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String orgCode = user.getOrgCode(); + System.out.println(annualCompid); topic.setSysOrgCode(orgCode); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(topic, req.getParameterMap()); Page page = new Page(pageNo, pageSize); diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue index 25c9d294..fff73315 100644 --- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue +++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue @@ -191,7 +191,7 @@ function handleEdittopic(record: Recordable) { router.push({ path: '/compp/topic', - query: {id: record.id} + query: {annualCompid: record.id} }); } diff --git a/jeecgboot-vue3-master/src/views/topic/TopicList.vue b/jeecgboot-vue3-master/src/views/topic/TopicList.vue index b24efe38..d2798413 100644 --- a/jeecgboot-vue3-master/src/views/topic/TopicList.vue +++ b/jeecgboot-vue3-master/src/views/topic/TopicList.vue @@ -119,6 +119,8 @@ import JSwitch from '/@/components/Form/src/jeecg/components/JSwitch.vue'; import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue'; import JInput from "/@/components/Form/src/jeecg/components/JInput.vue"; import TopicModal1 from "/@/views/topic/components/TopicModal1.vue"; +import {useRoute} from "vue-router"; +const route = useRoute(); const formRef = ref(); const queryParam = reactive({}); @@ -138,7 +140,7 @@ const {prefixCls, tableContext, onExportXls, onImportXls} = useListPage({ fixed: 'right', }, beforeFetch: (params) => { - return Object.assign(params, queryParam); + return Object.assign(params, {annualCompid:route.query.annualCompid}); }, }, exportConfig: {