Merge branch 'dev' into 'master'

fix: 性别问题

See merge request !6

mini-app/src/main/java/com/onsiteservice/miniapp/service/user/UserService.java

@@ -44,9 +44,7 @@ import tk.mybatis.mapper.entity.Condition;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 @Service
@@ -127,7 +125,8 @@ public class UserService extends AbstractMapper<User> {
     public UserInfoVO getInfo(Long userId) {
         var user = userMapper.selectByPrimaryKey(userId);
         var vo = userConvert.toUserVO(user);
-        vo.setSex(InitDataRunner.dictData.get(DictConstants.SEX).get(vo.getSexValue()).get("value").toString());
+        Optional<Map> code = InitDataRunner.dictData.get(DictConstants.SEX).stream().filter(m -> m.get("code").equals(user.getSex().toString())).findAny();
+        vo.setSex(code.orElseGet(() -> Map.of("value", "未知")).get("value").toString());
 
         // 待处理数量
         if (Objects.equals(user.getRoleType(), ServiceUserTypeEnum.ADMIN.getId())) {