修复 用户登录 查询列表等问题

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/infrastructure/interceptor/IwepTokenInterceptor.java

@@ -39,7 +39,7 @@ public class IwepTokenInterceptor extends HandlerInterceptorAdapter {
         if(ignoreToken != null){
             return true;
         }
-        String token = request.getHeader("user");
+        String token = request.getHeader("Authorization");
         if(StringUtils.isBlank(token)){
             token = request.getParameter("auth_token");
         }

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/service/impl/LoginServiceImpl.java

@@ -57,14 +57,15 @@ public class LoginServiceImpl extends ServiceImpl<UserInfoMapper, UserInfo> impl
     public BaseResponse login(LoginReq req) {
         UserInfo one = lambdaQuery().eq(UserInfo::getUserName, req.getUserName().trim()).eq(UserInfo::getPassword, req.getPassword()).eq(UserInfo::getIsEnable, 1).eq(UserInfo::getIsDelete, 0).select(UserInfo::getId).one();
         if (Objects.nonNull(one)) {
+            UserInfo userInfo = userInfoMapper.selectById(one.getId());
             QueryWrapper<UserRole> roleQueryWrapper = new QueryWrapper<>();
-            roleQueryWrapper.eq("role_code", one.getRoleCode());
+            roleQueryWrapper.eq("role_code", userInfo.getRoleCode());
             roleQueryWrapper.eq("is_delete", 0);
             UserRole userRole = userRoleMapper.selectOne(roleQueryWrapper);
             if (Objects.isNull(userRole)) {
                 return BaseResponse.createFail(null, ErrorCodeEnum.USER_ROLE_NOT_EXISTED.getCode(), ErrorCodeEnum.USER_ROLE_NOT_EXISTED.getMessage());
             }
-            UserUtil.setUser(one);
+            UserUtil.setUser(userInfo);
             String uuid = UUIDutils.getUUID();
             //token为key，id为value。过期时间30天
             redisUtil.set(RedisKey.USER_TOKEN_ID + ":" + uuid, one.getId(), BaseFinal.REDIS_USER_EXPIRE_TIME);

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/UserInfoMapper.xml

@@ -29,13 +29,13 @@
 
     <!--列表查询列-->
     <sql id="Base_Column_List_Page">
-        u.ID, u.USER_NAME, u.EMPLOYEE_NO, u.PHONE, u.EMAIL, d.dept_name, f.factory_name, r.role_name, u.is_enable,
+        u.ID, u.USER_NAME, u.EMPLOYEE_NO, u.PHONE, u.EMAIL, d.dept_name, f.factory_name, r.role_name, u.is_enable, u.update_time
     </sql>
 
     <select id="selectUserInfoPage" resultType="com.abi.qms.platform.dto.res.entity.UserInfoResp">
         SELECT
         <include refid="Base_Column_List_Page"/>
-        FROM user_info u
+        from user_info u
         LEFT JOIN base_department d ON u.dept_id = d.id
         LEFT JOIN base_factory f ON u.factory_id = f.id
         LEFT JOIN user_role r ON u.role_code = r.role_code
@@ -52,7 +52,7 @@
         <if test="req.isEnable != null">
             AND u.is_enable = #{req.isEnable}
         </if>
-        and is_delete = 0
+        and u.is_delete = 0
         order by u.UPDATE_TIME desc
     </select>