Merge branch 'dev-yhq' into develop

db/ai_material_tag.sql

@@ -32,6 +32,8 @@ INSERT INTO ai_material_tag(category_id, tag_name, sort) VALUES
     (3, '修仙场景', 10),
     (3, '都市场景', 9),
     (3, '历史场景', 8),
+    (3, '8090场景', 7),
+    (3, '末日悬疑场景', 6),
     # 3-沙雕素材-异兽素材
     (4, '异兽', 10),
     (4, '动物', 9),

src/main/java/com/backendsys/modules/system/entity/SysUserInfo.java

@@ -1,15 +1,18 @@
 package com.backendsys.modules.system.entity;
 
+import com.backendsys.config.Mybatis.handler.timezone.LocalDateTimeAdapter;
 import com.backendsys.entity.System.SysUserDTO;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.google.gson.annotations.JsonAdapter;
 import jakarta.validation.constraints.NotEmpty;
 import lombok.Data;
 
 import jakarta.validation.constraints.NotNull;
 
+import java.time.LocalDateTime;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -46,8 +49,12 @@ public class SysUserInfo {
     private Integer status;
     private Integer audit_status;
     private String audit_note;
-    private String create_time;
-    private String update_time;
+
+    @JsonAdapter(LocalDateTimeAdapter.class)
+    private LocalDateTime create_time;
+    @JsonAdapter(LocalDateTimeAdapter.class)
+    private LocalDateTime update_time;
+
     private Integer del_flag;
 
     @TableField(exist = false)

src/main/java/com/backendsys/modules/system/entity/SysUserInfoSimple.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -33,8 +34,10 @@ public class SysUserInfoSimple {
     private Integer status;
     private Integer audit_status;
     private String audit_note;
-    private String create_time;
-    private String update_time;
+
+    private LocalDateTime create_time;
+    private LocalDateTime update_time;
+
     private Integer del_flag;
     private List<Map<String, Object>> roles;
     private List<Long> role_id;

src/main/java/com/backendsys/modules/system/service/impl/SysUserServiceImpl.java

@@ -144,10 +144,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUser> impleme
         // 获得 用户账号信息
         SysUser sysUser = sysUserDao.selectOne(new QueryWrapper<SysUser>().eq("id", user_id));
         if (sysUser == null) throw new CustException("用户不存在");
+        System.out.println("sysUser = " + sysUser);
+        System.out.println("-----------");
 
         // 获得 用户基本信息
         SysUserInfo sysUserInfo = sysUserInfoDao.selectOne(new QueryWrapper<SysUserInfo>().eq("user_id", user_id));
         if (sysUserInfo == null) throw new CustException("用户不存在");
+        System.out.println("sysUserInfo = " + sysUserInfo);
+        System.out.println("-----------");
 
         // 获得 用户角色
         List<Map<String, Object>> roles = sysUserRoleDao.selectRoleByUserId(user_id);
@@ -157,16 +161,16 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUser> impleme
         List<Long> role_ids = roles.stream().map(m -> Convert.toLong(m.get("role_id"))).collect(Collectors.toList());
         sysUserInfo.setRole_id(role_ids);
 
-
-
         // 获得用户积分 (需要权限)
         Integer integral = sysUserIntegralService.selectIntegralByUserId(user_id);
         sysUserInfo.setIntegral(integral);
 
-
         // 用户账号信息 赋值到 用户基本信息
         BeanUtils.copyProperties(sysUser, sysUserInfo);
 
+        System.out.println("sysUserInfo + sysUser = " + sysUserInfo);
+        System.out.println("-----------");
+
         // 用户基本信息 赋值到 用户基本信息(简约)
         SysUserInfoSimple sysUserInfoSimple = new SysUserInfoSimple();
         BeanUtils.copyProperties(sysUserInfo, sysUserInfoSimple);