From 037b44312e62d94aac24ff0b2234b3a14344a520 Mon Sep 17 00:00:00 2001 From: sh Date: Wed, 20 May 2026 19:45:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=E4=B8=AD=EF=BC=8C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=90=A7=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=EF=BC=8C=E7=94=A8=E4=BA=8E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=94=BF=E7=AD=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cms/service/impl/AppUserServiceImpl.java | 4 ++ .../java/com/ruoyi/cms/util/DictUtils.java | 38 +++++++++++++++++++ .../common/core/domain/entity/AppUser.java | 4 ++ 3 files changed, 46 insertions(+) diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java index 7611fd0..0cd7d2d 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.cms.domain.JobApply; import com.ruoyi.cms.domain.UserInfoDetail; import com.ruoyi.cms.util.AppUserFieldCustomCopy; +import com.ruoyi.cms.util.DictUtils; import com.ruoyi.cms.util.encrypt.QuickValidUtils; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.MyChart; @@ -141,6 +142,9 @@ public class AppUserServiceImpl extends ServiceImpl imple file.setBussinessid(userId); List files=fileMapper.selectFileList(file); appUser.setFileList(files); + if(!StringUtils.isBlank(appUser.getUserTag())){ + appUser.setUserTagName(DictUtils.getDictLabelNames("user_type",appUser.getUserTag(),",")); + } } return appUser; } diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/DictUtils.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/DictUtils.java index e4ffb76..e134948 100644 --- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/DictUtils.java +++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/util/DictUtils.java @@ -6,9 +6,12 @@ import com.ruoyi.common.constant.CacheConstants; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; +import org.apache.commons.collections4.CollectionUtils; import java.util.Collection; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 字典工具类 @@ -124,6 +127,41 @@ public class DictUtils return StringUtils.stripEnd(propertyString.toString(), separator); } + /** + * 根据字典类型和字典值获取字典标签 + * @param dictType 字典类型 + * @param dictValue 字典值（支持单个值 或 逗号/指定分隔符分隔的多个值） + * @param separator 分隔符 + * @return 字典标签（多个用传入的分隔符隔开） + */ + public static String getDictLabelNames(String dictType, String dictValue, String separator) { + if (StringUtils.isBlank(dictType) || StringUtils.isBlank(dictValue)) { + return StringUtils.EMPTY; + } + + List datas = getDictCache(dictType); + if (CollectionUtils.isEmpty(datas)) { + return StringUtils.EMPTY; + } + + Map dictMap = new HashMap<>(); + for (BussinessDictData dict : datas) { + dictMap.put(dict.getDictValue().trim(), dict.getDictLabel()); + } + + StringBuilder labelSb = new StringBuilder(); + String[] valueArr = dictValue.split(separator); + + for (String val : valueArr) { + String value = val.trim(); + if (dictMap.containsKey(value)) { + labelSb.append(dictMap.get(value)).append(separator); + } + } + + return StringUtils.stripEnd(labelSb.toString(), separator); + } + /** * 根据字典类型和字典标签获取字典值 * diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java index 857f5cc..c8dffdf 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/AppUser.java @@ -189,4 +189,8 @@ public class AppUser extends BaseEntity @ApiModelProperty("人员标签 0残疾人 1职业（技工）院校毕业生 2退役军人 3高校毕业生 4脱贫劳动力 5零就业家庭人员 6就业困难人员 7失业人员 8低保家庭") private String userTag; + + @TableField(exist = false) + @ApiModelProperty("人员标签名称") + private String userTagName; }