24282 před 2 roky
rodič
revize
1139d3bde8

+ 2 - 2
hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/TenantInfoController.java

@@ -108,11 +108,11 @@ public class TenantInfoController {
      * 加载对应角色菜单列表树
      */
     @GetMapping(value = "/roleMenuTreeSelect/{tenantId}")
-    public AjaxResult roleMenuTreeSelect(@PathVariable("tenantId") String tenantId) {
+    public AjaxResult roleMenuTreeSelect(@PathVariable String tenantId) {
 
         SysRole sysRole = sysRoleService.getOne(Wrappers.<SysRole>lambdaQuery()
                 .eq(SysRole::getTenantId, tenantId).eq(SysRole::getRoleKey, "admin"));
-        
+
         List<SysMenu> menus = menuService.selectMenuList(SecurityUtils.getUserId());
         AjaxResult ajax = AjaxResult.success();
         ajax.put("checkedKeys", menuService.selectMenuListByRoleId(sysRole.getRoleId()));

+ 2 - 0
hx-tenant/src/main/java/com/fjhx/tenant/controller/tenant/UserTenantController.java

@@ -3,6 +3,7 @@ package com.fjhx.tenant.controller.tenant;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.constant.DatasourceConstant;
 import com.ruoyi.common.core.controller.BaseController;
@@ -43,6 +44,7 @@ public class UserTenantController extends BaseController {
      * 新增用户
      */
     @Log(title = "用户管理", businessType = BusinessType.INSERT)
+    @RepeatSubmit
     @PostMapping
     public void add(@Validated @RequestBody SysUser user) {
         String tenantId = user.getTenantId();

+ 2 - 2
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -34,7 +34,7 @@ public class BaseEntity implements Serializable {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(exist = false)
     private Date createTime;
 
@@ -47,7 +47,7 @@ public class BaseEntity implements Serializable {
     /**
      * 更新时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField(exist = false)
     private Date updateTime;
 

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysLogininfor.java

@@ -68,7 +68,7 @@ public class SysLogininfor extends BaseEntity {
     /**
      * 访问时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date loginTime;
 

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysOperLog.java

@@ -115,7 +115,7 @@ public class SysOperLog extends BaseEntity {
     /**
      * 操作时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;
 

+ 2 - 0
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.core.domain.entity.SysMenu;
 import org.apache.ibatis.annotations.Param;
 
@@ -49,6 +50,7 @@ public interface SysMenuMapper extends BaseMapper<SysMenu> {
      * @param userId 用户ID
      * @return 权限列表
      */
+    @TenantIgnore
     public List<String> selectMenuPermsByUserId(Long userId);
 
     /**