From aa01829055f7711f6b46c40632997641e1a9e38d Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Mon, 04 Jul 2022 19:54:13 +0800 Subject: [PATCH] fix --- src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java | 2 +- src/main/java/com/xcong/farmer/cms/modules/system/mapper/ColumnMapper.java | 2 ++ src/main/resources/mapper/ColumnMapper.xml | 4 ++++ 3 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/ColumnMapper.java b/src/main/java/com/xcong/farmer/cms/modules/system/mapper/ColumnMapper.java index cf96271..8816587 100644 --- a/src/main/java/com/xcong/farmer/cms/modules/system/mapper/ColumnMapper.java +++ b/src/main/java/com/xcong/farmer/cms/modules/system/mapper/ColumnMapper.java @@ -14,4 +14,6 @@ IPage<AdminColumnVo> selectAdminColumnVoInPage(Page<AdminColumnVo> page, @Param("record")ColumnEntity columnEntity); List<AdminColumnVo> selectColumnInListByParentId(@Param("parentId")Long parentidDefault,@Param("belongId")Long belongId); + + ColumnEntity selectByCodeAndCompanyId(@Param("code") String code, @Param("companyId") Long companyId); } diff --git a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java index c18c3e7..684a206 100644 --- a/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java +++ b/src/main/java/com/xcong/farmer/cms/modules/system/service/Impl/ColumnServiceImpl.java @@ -161,7 +161,7 @@ ArticleEntity articleEntity = articleMapper.selectById(Long.parseLong(columnEntity.getTargetUrl())); adminSeeColumnInfoVo.setTargetName(articleEntity.getTitle()); } else if (columnEntity.getTargetType() == 2) { - ColumnEntity column = this.baseMapper.selectById(Long.parseLong(columnEntity.getTargetUrl())); + ColumnEntity column = this.baseMapper.selectByCodeAndCompanyId(columnEntity.getTargetUrl(), LoginUserUtil.getCompanyId()); adminSeeColumnInfoVo.setTargetName(column.getColumnName()); } } diff --git a/src/main/resources/mapper/ColumnMapper.xml b/src/main/resources/mapper/ColumnMapper.xml index eb425ab..ee49cf2 100644 --- a/src/main/resources/mapper/ColumnMapper.xml +++ b/src/main/resources/mapper/ColumnMapper.xml @@ -29,4 +29,8 @@ order by a.order_num ASC,a.create_time desc </select> + <select id="selectByCodeAndCompanyId" resultType="com.xcong.farmer.cms.modules.system.entity.ColumnEntity"> + select * from t_column + where column_code=#{code} and company_id=#{companyId} + </select> </mapper> \ No newline at end of file -- Gitblit v1.9.1