合并其他人修改提交

ant-design-vue-jeecg/src/mixins/JeecgListMixin.js

@@ -233,7 +233,7 @@ export const JeecgListMixin = {
       if(!fileName || typeof fileName != "string"){
         fileName = "导出文件"
       }
-      let param = {...this.queryParam};
+      let param = {...this.getQueryParams()};
       if(this.selectedRowKeys && this.selectedRowKeys.length>0){
         param['selections'] = this.selectedRowKeys.join(",")
       }

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/mapper/SysUserDepartMapper.java

@@ -2,11 +2,11 @@ package org.jeecg.modules.system.mapper;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.system.entity.SysUserDepart;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-import io.lettuce.core.dynamic.annotation.Param;
 
 public interface SysUserDepartMapper extends BaseMapper<SysUserDepart>{
 	

jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java

@@ -363,7 +363,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		}
 		//情况2：根据用户信息查询，该用户已注销
 		//update-begin---author:王帅   Date:20200601  for：if条件永远为falsebug------------
-		if (CommonConstant.DEL_FLAG_1==sysUser.getDelFlag()) {
+		if (CommonConstant.DEL_FLAG_1.equals(sysUser.getDelFlag())) {
 		//update-end---author:王帅   Date:20200601  for：if条件永远为falsebug------------
 			baseCommonService.addLog("用户登录失败，用户名:" + sysUser.getUsername() + "已注销！", CommonConstant.LOG_TYPE_1, null);
 			result.error500("该用户已注销");