车企和检测机构

quality-review/src/main/java/com/ruoyi/service/impl/TTestPlanRecordServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.service.impl;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.domain.TTestPlanRecord;
 import com.ruoyi.domain.vo.ItemsByUseCaseVO;
@@ -45,7 +46,8 @@ public class TTestPlanRecordServiceImpl extends ServiceImpl<TTestPlanRecordMappe
 
     @Override
     public List<TTestPlanRecord> selectTestPlanRecordPage(TestPlanRecordPageRequest testPlanRecordPageRequest){
-        if(SecurityUtils.getLoginUser().getUser().getRoleId().equals(114)){
+        Long roleId  =  SecurityUtils.getLoginUser().getUser().getRoleId();
+        if(roleId.equals(113)){
             testPlanRecordPageRequest.setTestOrganizationId(SecurityUtils.getDeptId());
         }
         return tTestPlanRecordMapper.selectTestPlanRecordPage(testPlanRecordPageRequest);

ruoyi-admin/src/main/resources/application-druid.yml

@@ -6,7 +6,7 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://106.3.99.64:20011/vehicle-quality-review-2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&sessionVariables=group_concat_max_len=3000
+                url: jdbc:mysql://10.12.48.76:22030/vehicle-quality-review-2?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&sessionVariables=group_concat_max_len=3000
                 username: root
                 password: 1qaz@WSX
             # 从库数据源

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -90,6 +90,9 @@ public class SysUser extends BaseEntity
     /** 角色ID */
     private Long roleId;
 
+    /** 角色 */
+    private String roleKey;
+
     /** 用户签字图片 */
     private String signaturePicture;
 

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateBy"     column="update_by"    />
         <result property="updateTime"   column="update_time"  />
         <result property="remark"       column="remark"       />
+		<result property="roleId"       column="role_id"       />
         <result property="signaturePicture"       column="signature_picture"       />
         <association property="dept"    javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"   javaType="java.util.List"  resultMap="RoleResult" />
@@ -50,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.signature_picture,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
-        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
+        r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status,r.role_key as roleKey
         from sys_user u
 		    left join sys_dept d on u.dept_id = d.dept_id
 		    left join sys_user_role ur on u.user_id = ur.user_id