diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/HealthConsultResource.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/HealthConsultResource.java index 6bafc74..255c080 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/HealthConsultResource.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/HealthConsultResource.java @@ -1,6 +1,7 @@ package org.jeecg.modules.system.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -121,10 +122,11 @@ public class HealthConsultResource implements Serializable { @Schema(title = "医院图片") private String img; /** - * 医院简介 + * 医院简介(DM8 保留字,需加引号) */ @Excel(name = "医院简介", width = 15) @Schema(title = "医院简介") + @TableField(value = "\"DESC\"") private String desc; /** * 排序序号 diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java index 5f3d0a2..da5a047 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java @@ -37,6 +37,15 @@ public interface SysDepartMapper extends BaseMapper { */ public List queryUserDeparts(@Param("userId") String userId); + /** + * 根据 orgCode 集合查询部门(仅返回 id、depart_name、org_code 三个字段), + * 用于替换 LambdaQueryWrapper.select() 避免 DM8 解析异常 + * + * @param orgCodes 机构编码集合 + * @return 部门列表 + */ + List selectByOrgCodes(@Param("orgCodes") List orgCodes); + /** * 根据部门编码集合查询部门id集合 * @param orgCodes diff --git a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml index 916aa0a..a0d53c7 100644 --- a/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml +++ b/jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml @@ -6,6 +6,17 @@ select * from QH_SYS_DEPART where id IN ( select dep_id from QH_SYS_USER_DEPART where user_id = #{userId} ) + + +