增加缺少的is_delete字段

authentication/src/main/java/com/jzg/mapper/SysRolePermsMapper.java

@@ -3,6 +3,7 @@ package com.jzg.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.entity.SysRolePerms;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -14,5 +15,5 @@ public interface SysRolePermsMapper extends BaseMapper<SysRolePerms> {
      * @param userId    用户id
      * @param systemId  租户编码
      */
-    List<SysRolePerms> getUserPerms(String userId, String systemId);
+    List<SysRolePerms> getUserPerms(@Param("userId") String userId, @Param("systemId") String systemId);
 }

authentication/src/main/java/com/jzg/mapper/SysUserMapper.java

@@ -14,7 +14,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * @param userId 用户id
      * @param system 系统id
      */
-    public SysUserJzgVo getJzgUserInfo(String userId,String system);
+    public SysUserJzgVo getJzgUserInfo(@Param("userId") String userId,@Param("system") String system);
 
     /**
      * 获取用户信息

authentication/src/main/java/com/jzg/mapper/SysUserRoleMapper.java

@@ -5,6 +5,7 @@ import com.jzg.entity.SysRolePerms;
 import com.jzg.entity.SysUserRole;
 import com.jzg.entity.vo.SysRoleDataPreVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -16,6 +17,6 @@ public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
      * @param userId    用户id
      * @return
      */
-    List<SysRoleDataPreVo> getUserRoleDataPre(String userId);
+    List<SysRoleDataPreVo> getUserRoleDataPre(@Param("userId") String userId);
 
 }

authentication/src/main/resources/mapper/SysRolePermsMapper.xml

@@ -2,21 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jzg.mapper.SysRolePermsMapper">
 
-
     <select id="getUserPerms" resultType="com.jzg.entity.SysRolePerms">
         SELECT
-            srp.*,
-            ss.sys_code
+        srp.*,
+        ss.sys_code
         FROM
-            sys_user su
-                INNER JOIN sys_user_role sur ON su.id = sur.user_id
-                INNER JOIN sys_role sr ON sr.id = sur.role_id
-                INNER JOIN sys_role_perms srp ON sur.role_id = srp.role_id
-                INNER JOIN sys_system ss ON ss.sys_code = sr.system_code
-        WHERE
-            su.id = #{userId}
-        AND ss.sys_code = #{systemId}
-
+        sys_user su
+        INNER JOIN sys_user_role sur ON su.id = sur.user_id AND sur.is_delete = 0
+        INNER JOIN sys_role sr ON sr.id = sur.role_id AND sr.is_delete = 0
+        INNER JOIN sys_role_perms srp ON sur.role_id = srp.role_id AND srp.is_delete = 0
+        INNER JOIN sys_system ss ON ss.sys_code = sr.system_code AND ss.is_delete = 0
+        <where>
+            AND su.is_delete = 0
+            <if test="userId != null">
+                AND su.id = #{userId}
+            </if>
+            <if test="systemId != null and systemId != ''">
+                AND ss.sys_code = #{systemId}
+            </if>
+        </where>
     </select>
 
-</mapper>
+</mapper>

authentication/src/main/resources/mapper/SysSystemMapper.xml

@@ -42,6 +42,6 @@
                business_size,legal_name,create_by,
                create_time,update_by,update_time,
                is_delete
-        from sys_system
+        from sys_system where is_delete = 0
     </sql>
 </mapper>

authentication/src/main/resources/mapper/SysUserMapper.xml

@@ -2,39 +2,47 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.jzg.mapper.SysUserMapper">
 
-
+    <!-- 获取用户信息 -->
     <select id="getJzgUserInfo" resultType="com.jzg.entity.vo.SysUserJzgVo">
         SELECT
-            su.id,
-            su.username,
-            su.`password`,
-            su.salt,
-            su.mobile,
-            su.account_status,
-            suji.dept_id,
-            suji.NAME,
-            suji.work_number,
-            suf.file_name AS head_sculpture,
-            suji.province
+        su.id,
+        su.username,
+        su.`password`,
+        su.salt,
+        su.mobile,
+        su.account_status,
+        suji.dept_id,
+        suji.NAME,
+        suji.work_number,
+        suf.file_name AS head_sculpture,
+        suji.province
         FROM
-            sys_user su
-                LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id
-                LEFT JOIN sys_upload_files suf ON su.head_sculpture = suf.id
-        WHERE
-            su.id = #{userId}
-        AND
-            suji.system_code = #{system}
+        sys_user su
+        LEFT JOIN sys_user_jzg_info suji ON su.id = suji.user_id AND suji.is_delete = 0
+        LEFT JOIN sys_upload_files suf ON su.head_sculpture = suf.id AND suf.is_delete = 0
+        <where>
+            and su.is_delete = 0
+            <if test="userId != null">
+                AND su.id = #{userId}
+            </if>
+            <if test="system != null and system != ''">
+                AND suji.system_code = #{system}
+            </if>
+        </where>
     </select>
 
+    <!-- 根据用户名/手机号查询 -->
     <select id="selectByUserName" resultType="com.jzg.entity.SysUser">
         SELECT
-            su.*
+        su.*
         FROM
-            sys_user su
-        WHERE
-        account_status = 1 AND is_delete = 0
-        <if test="username != null and username != ''">
-           AND (su.username = #{username} or su.mobile = #{username})
-        </if>
+        sys_user su
+        <where>
+            AND su.account_status = 1 AND su.is_delete = 0
+            <if test="username != null and username != ''">
+                AND (su.username = #{username} OR su.mobile = #{username})
+            </if>
+        </where>
     </select>
-</mapper>
+
+</mapper>

authentication/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -8,9 +8,13 @@
         *
         FROM
         sys_user_role sur
-        left join sys_role_data_pre srdp on sur.role_id = srdp.role_id
-        left join sys_role_data_pre_link srdpl on srdp.role_id = srdpl.role_id
-        WHERE
-        sur.user_id = #{userId}
+        left join sys_role_data_pre srdp on sur.role_id = srdp.role_id AND srdp.is_delete = 0
+        left join sys_role_data_pre_link srdpl on srdp.role_id = srdpl.role_id AND srdpl.is_delete = 0
+        <where>
+            AND sur.is_delete = 0
+            <if test="userId != null">
+                AND sur.user_id = #{userId}
+            </if>
+        </where>
     </select>
 </mapper>