修改数据问题 解决查询内容

cdp-common/cdp-common-core/src/main/java/com/baiye/core/base/BaseEntity.java

@@ -1,5 +1,7 @@
 package com.baiye.core.base;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -7,6 +9,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.io.Serializable;
 import java.lang.reflect.Field;
+import java.sql.Date;
 import java.sql.Timestamp;
 
 /**
@@ -27,10 +30,11 @@ public class BaseEntity implements Serializable {
     private String updateBy;
 
     @ApiModelProperty(value = "创建时间", hidden = true)
-
+    @TableField(fill = FieldFill.INSERT)
     private Timestamp createTime;
 
     @ApiModelProperty(value = "更新时间", hidden = true)
+    @TableField(fill = FieldFill.INSERT_UPDATE)
     private Timestamp updateTime;
 
 

cdp-common/cdp-common-mybatis-plus/src/main/java/com/baiye/config/MyMetaObjectHandler.java

@@ -1,11 +1,12 @@
 package com.baiye.config;
 
-import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
 
+import java.sql.Timestamp;
+
 /**
  * @author Enzo
  * @date : 2022/8/4
@@ -16,12 +17,12 @@ import org.springframework.stereotype.Component;
 public class MyMetaObjectHandler implements MetaObjectHandler {
     @Override
     public void insertFill(MetaObject metaObject) {
-        this.setFieldValByName("createTime", DateUtil.date(), metaObject);
-        this.setFieldValByName("updateTime", DateUtil.date(), metaObject);
+        this.setFieldValByName("createTime", new Timestamp(System.currentTimeMillis()), metaObject);
+        this.setFieldValByName("updateTime", new Timestamp(System.currentTimeMillis()), metaObject);
     }
 
     @Override
     public void updateFill(MetaObject metaObject) {
-        this.setFieldValByName("updateTime", DateUtil.date(), metaObject);
+        this.setFieldValByName("updateTime", new Timestamp(System.currentTimeMillis()), metaObject);
     }
 }

cdp-iaas/authorization-server/src/main/resources/config/application-prod.yml

@@ -11,7 +11,7 @@ spring:
       username: root
   redis:
     #数据库索引
-    database: 9
+    database: 8
     host: 172.16.69.134
     port: 6379
     #连接超时时间

cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/java/com/baiye/service/impl/MenuServiceImpl.java

@@ -2,6 +2,10 @@ package com.baiye.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.text.CharSequenceUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baiye.Menu;
 import com.baiye.Role;
 import com.baiye.User;
@@ -9,6 +13,7 @@ import com.baiye.core.constant.CacheKey;
 import com.baiye.core.page.PageResult;
 import com.baiye.core.util.FileUtils;
 import com.baiye.core.util.RedisUtils;
+import com.baiye.core.util.RequestUtils;
 import com.baiye.core.util.StringUtils;
 import com.baiye.dto.MenuDto;
 import com.baiye.exception.global.BadRequestException;
@@ -45,9 +50,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 /**
- *
- * @description 菜单业务实现类
  * @author Enzo
+ * @description 菜单业务实现类
  * @create: 2020-08-12 18:24
  */
 @Service
@@ -69,7 +73,6 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
     private static final String FIRST_LEVEL_PATH_PRE = "/";
 
 
-
     private static final String HTTP_PRE = "http://";
 
     private static final String HTTPS_PRE = "https://";
@@ -77,7 +80,6 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
     private static final String DEFAULT_COMPONENT = "Layout";
 
 
-
     /**
      * 根据角色的id来查询菜单信息
      *
@@ -120,7 +122,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
     @Override
     public PageResult queryAllByPage(MenuQueryCriteria queryCriteria, Pageable pageable) {
         Page<Menu> page = PageUtils.startPageAndSort(pageable);
-        if (BeanUtil.isEmpty(queryCriteria)){
+        if (BeanUtil.isEmpty(queryCriteria)) {
             queryCriteria.setPid(0L);
         }
         QueryWrapper<Menu> wrapper = QueryHelpUtils.getWrapper(queryCriteria, Menu.class);
@@ -375,7 +377,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
     @Override
     public void download(List<MenuDto> data, HttpServletResponse response) throws IOException {
         // TODO: 2020/8/15 后续处理导出数据
-        FileUtils.downloadFailedUsingJson(response,"menu-info",MenuDto.class,data,"sheet1");
+        FileUtils.downloadFailedUsingJson(response, "menu-info", MenuDto.class, data, "sheet1");
     }
 
     /**

cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/mapper/MenuMapper.xml

@@ -110,6 +110,7 @@
         LEFT JOIN sys_roles_menus srm ON sm.menu_id = srm.menu_id
         LEFT JOIN sys_users_roles sur ON srm.role_id = sur.role_id
         LEFT JOIN sys_user su ON sur.user_id = su.user_id
+        AND type < 2
         WHERE su.user_id = #{currentUserId}
     </select>
 

cdp-manager/backstage-manger-server/backstage-manger-server-service/src/main/resources/mapper/UserMapper.xml

@@ -87,20 +87,14 @@
                <include refid="baseUserSql">
                    <property name="property" value="sys_user"/>
                </include>,
-               sj.job_id,
-               sj.name AS job_name,
         sr.role_id,
-               sr.name AS role_name,
-               sr.level,
-               sr.data_scope,
-               sd.dept_id,
-               sd.name AS dept_name
-        FROM (sys_user,sys_dept sd)
-                 LEFT JOIN sys_users_jobs suj ON sys_user.user_id = suj.user_id
-                 LEFT JOIN sys_job sj ON suj.job_id = sj.job_id
-                 LEFT JOIN sys_users_roles sur ON sys_user.user_id = sur.user_id
-                 LEFT JOIN sys_role sr ON sur.role_id = sr.role_id
-        WHERE (sd.dept_id = sys_user.dept_id)
+        sr.NAME AS role_name,
+        sr.LEVEL,
+        sr.data_scope
+        FROM
+        sys_user
+        JOIN sys_users_roles sur ON sys_user.user_id = sur.user_id
+        JOIN sys_role sr ON sur.role_id = sr.role_id
     </sql>
 
     <sql id="selectUserWithRole">