Merge branch 'master' of http://115.233.227.46:8066/root/govdna.git

.classpath

@@ -17,11 +17,6 @@
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>

pom.xml

@@ -19,8 +19,8 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<mybatisplus.spring.boot.version>1.0.5</mybatisplus.spring.boot.version>
-		<mybatisplus.version>2.1.9</mybatisplus.version>
+		<mybatis-spring-boot-starter>1.3.2</mybatis-spring-boot-starter>
+		<mybatisplus.version>3.0-beta</mybatisplus.version>
 		<mysql.version>5.1.38</mysql.version>
 		<druid.version>1.1.3</druid.version>
 		<quartz.version>2.3.0</quartz.version>
@@ -67,15 +67,20 @@
 		</dependency>
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>mybatisplus-spring-boot-starter</artifactId>
-			<version>${mybatisplus.spring.boot.version}</version>
+			<artifactId>mybatis-plus</artifactId>
+			<version>${mybatisplus.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus</artifactId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
 			<version>${mybatisplus.version}</version>
 		</dependency>
 		<dependency>
+			<groupId>org.mybatis.spring.boot</groupId>
+			<artifactId>mybatis-spring-boot-starter</artifactId>
+			<version>${mybatis-spring-boot-starter}</version>
+		</dependency>
+		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 		</dependency>

src/main/java/com/govmade/common/utils/MyMetaObjectHandler.java

@@ -4,7 +4,7 @@ import java.util.Date;
 
 import org.apache.ibatis.reflection.MetaObject;
 
-import com.baomidou.mybatisplus.mapper.MetaObjectHandler;
+import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.govmade.modules.system.entity.UserEntity;
 
 import cn.hutool.core.date.DateUtil;

src/main/java/com/govmade/common/utils/PageUtils.java

 package com.govmade.common.utils;
 
-import com.baomidou.mybatisplus.plugins.Page;
-
 import java.io.Serializable;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+
 /**
  * 分页工具类
  * 
@@ -15,13 +15,13 @@ import java.util.List;
 public class PageUtils implements Serializable {
 	private static final long serialVersionUID = 1L;
 	
-	private int totalCount;	// 总记录数
+	private long totalCount;	// 总记录数
 	
-	private int pageSize;	// 每页记录数
+	private long pageSize;	// 每页记录数
 	
-	private int totalPage;	// 总页数
+	private long totalPage;	// 总页数
 	
-	private int currPage;	// 当前页数
+	private long currPage;	// 当前页数
 	
 	private List<?> list;	// 列表数据
 
@@ -37,54 +37,54 @@ public class PageUtils implements Serializable {
 	 * @param currPage
 	 *            当前页数
 	 */
-	public PageUtils(List<?> list, int totalCount, int pageSize, int currPage) {
+	public PageUtils(List<?> list, long totalCount, long pageSize, long currPage) {
 		this.list = list;
 		this.totalCount = totalCount;
 		this.pageSize = pageSize;
 		this.currPage = currPage;
-		this.totalPage = (int) Math.ceil((double) totalCount / pageSize);
+		this.totalPage = (long) Math.ceil((double) totalCount / pageSize);
 	}
 
 	/**
 	 * 分页
 	 */
-	public PageUtils(Page<?> page) {
+	public PageUtils(IPage<?> page) {
 		this.list = page.getRecords();
-		this.totalCount = page.getTotal();
+		this.totalCount = page.getPages();
 		this.pageSize = page.getSize();
 		this.currPage = page.getCurrent();
 		this.totalPage = page.getPages();
 	}
 
-	public int getTotalCount() {
+	public long getTotalCount() {
 		return totalCount;
 	}
 
-	public void setTotalCount(int totalCount) {
+	public void setTotalCount(long totalCount) {
 		this.totalCount = totalCount;
 	}
 
-	public int getPageSize() {
+	public long getPageSize() {
 		return pageSize;
 	}
 
-	public void setPageSize(int pageSize) {
+	public void setPageSize(long pageSize) {
 		this.pageSize = pageSize;
 	}
 
-	public int getTotalPage() {
+	public long getTotalPage() {
 		return totalPage;
 	}
 
-	public void setTotalPage(int totalPage) {
+	public void setTotalPage(long totalPage) {
 		this.totalPage = totalPage;
 	}
 
-	public int getCurrPage() {
+	public long getCurrPage() {
 		return currPage;
 	}
 
-	public void setCurrPage(int currPage) {
+	public void setCurrPage(long currPage) {
 		this.currPage = currPage;
 	}
 

src/main/java/com/govmade/common/utils/Query.java

@@ -21,7 +21,7 @@ import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 
-import com.baomidou.mybatisplus.plugins.Page;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.govmade.common.xss.SQLFilter;
 
 /**
@@ -71,8 +71,8 @@ public class Query<T> extends LinkedHashMap<String, Object> {
 
         //排序
         if(StringUtils.isNotBlank(sidx) && StringUtils.isNotBlank(order)){
-            this.page.setOrderByField(sidx);
-            this.page.setAsc("ASC".equalsIgnoreCase(order));
+            this.page.setDescs(sidx);
+            this.page.setAscs(order);
         }
 
     }

src/main/java/com/govmade/config/MybatisPlusConfig.java

@@ -3,7 +3,8 @@ package com.govmade.config;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.baomidou.mybatisplus.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+
 
 /**
  * mybatis-plus配置

src/main/java/com/govmade/modules/basic/entity/BaseEntity.java

@@ -3,9 +3,10 @@ package com.govmade.modules.basic.entity;
 import java.io.Serializable;
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+
 
 public abstract class BaseEntity<ID extends Serializable> implements Serializable {
 

src/main/java/com/govmade/modules/system/dao/AreaDao.java

@@ -7,7 +7,7 @@ import java.util.Set;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.govmade.modules.system.entity.AreaEntity;
 
 /**

src/main/java/com/govmade/modules/system/dao/DepartDao.java

 package com.govmade.modules.system.dao;
 
-import java.util.Set;
-
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.govmade.modules.system.entity.DepartEntity;
 
 /**

src/main/java/com/govmade/modules/system/dao/DictDao.java

@@ -7,7 +7,7 @@ import java.util.Set;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.govmade.modules.system.entity.DictEntity;
 
 /**

src/main/java/com/govmade/modules/system/dao/MenuDao.java

@@ -8,7 +8,7 @@ import java.util.Set;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.govmade.modules.system.entity.MenuEntity;
 
 /**

src/main/java/com/govmade/modules/system/dao/ModuleDao.java

@@ -5,7 +5,7 @@ import java.util.Set;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.govmade.modules.system.entity.ModuleEntity;
 
 /**

src/main/java/com/govmade/modules/system/dao/RoleDao.java

@@ -5,7 +5,7 @@ import java.util.Set;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.govmade.modules.system.entity.RoleEntity;
 
 /**

src/main/java/com/govmade/modules/system/dao/UserDao.java

@@ -6,7 +6,7 @@ import java.util.Set;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
-import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.govmade.modules.system.entity.UserEntity;
 
 /**

src/main/java/com/govmade/modules/system/entity/AreaEntity.java

@@ -2,8 +2,8 @@ package com.govmade.modules.system.entity;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.govmade.modules.basic.entity.BaseEntity;
 
 /**

src/main/java/com/govmade/modules/system/entity/DepartEntity.java

 package com.govmade.modules.system.entity;
 
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.govmade.modules.basic.entity.BaseEntity;
 
 /**

src/main/java/com/govmade/modules/system/entity/DictEntity.java

@@ -2,8 +2,8 @@ package com.govmade.modules.system.entity;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.govmade.modules.basic.entity.BaseEntity;
 
 /**

src/main/java/com/govmade/modules/system/entity/MenuEntity.java

@@ -2,8 +2,8 @@ package com.govmade.modules.system.entity;
 
 import java.util.List;
 
-import com.baomidou.mybatisplus.annotations.TableField;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.govmade.modules.basic.entity.BaseEntity;
 
 /**

src/main/java/com/govmade/modules/system/entity/ModuleEntity.java

 package com.govmade.modules.system.entity;
 
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.govmade.modules.basic.entity.BaseEntity;
 
 /**

src/main/java/com/govmade/modules/system/entity/RoleEntity.java

 package com.govmade.modules.system.entity;
 
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.govmade.modules.basic.entity.BaseEntity;
 
 /**

src/main/java/com/govmade/modules/system/entity/UserEntity.java

@@ -2,7 +2,7 @@ package com.govmade.modules.system.entity;
 
 import java.util.Date;
 
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.govmade.modules.basic.entity.BaseEntity;
 
 /**

src/main/java/com/govmade/modules/system/service/AreaService.java

@@ -3,7 +3,7 @@ package com.govmade.modules.system.service;
 import java.util.Map;
 import java.util.Set;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.govmade.common.utils.PageTreeUtils;
 import com.govmade.modules.system.entity.AreaEntity;
 

src/main/java/com/govmade/modules/system/service/DepartService.java

 package com.govmade.modules.system.service;
 
 import java.util.Map;
-import java.util.Set;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.govmade.common.utils.PageUtils;
 import com.govmade.modules.system.entity.DepartEntity;
 

src/main/java/com/govmade/modules/system/service/DictService.java

@@ -4,11 +4,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.govmade.common.utils.PageTreeUtils;
-import com.govmade.common.utils.PageUtils;
 import com.govmade.modules.system.entity.DictEntity;
-import com.govmade.modules.system.entity.UserEntity;
 
 /**
  * 系统管理 - 字典设置

src/main/java/com/govmade/modules/system/service/MenuService.java

@@ -5,9 +5,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.govmade.common.utils.PageTreeUtils;
-import com.govmade.common.utils.PageUtils;
 import com.govmade.modules.system.entity.MenuEntity;
 
 /**

src/main/java/com/govmade/modules/system/service/ModuleService.java

@@ -4,7 +4,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.govmade.common.utils.PageUtils;
 import com.govmade.modules.system.entity.ModuleEntity;
 

src/main/java/com/govmade/modules/system/service/RoleService.java

@@ -3,7 +3,7 @@ package com.govmade.modules.system.service;
 import java.util.Map;
 import java.util.Set;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.govmade.common.utils.PageUtils;
 import com.govmade.modules.system.entity.RoleEntity;
 

src/main/java/com/govmade/modules/system/service/UserService.java

@@ -3,7 +3,7 @@ package com.govmade.modules.system.service;
 import java.util.Map;
 import java.util.Set;
 
-import com.baomidou.mybatisplus.service.IService;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.govmade.common.utils.PageUtils;
 import com.govmade.modules.system.entity.UserEntity;
 

src/main/java/com/govmade/modules/system/service/impl/AreaServiceImpl.java

@@ -6,8 +6,8 @@ import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.govmade.common.utils.PageTreeUtils;
 import com.govmade.modules.system.dao.AreaDao;
@@ -37,7 +37,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaDao, AreaEntity> implements
 		params.put("start", start);
 		List<AreaEntity> allList = this.baseMapper.listTree(params);
 		List<AreaEntity> list = buildAreaTree(allList, 0L);
-		int totalCount = super.selectCount(new EntityWrapper<AreaEntity>().like(StrUtil.isNotBlank(name), "name", name)
+		int totalCount = super.selectCount(new QueryWrapper<AreaEntity>().like(StrUtil.isNotBlank(name), "name", name)
 				.eq("pid", 0).eq("state", 1));
 		return new PageTreeUtils(list, totalCount, pageSize, currPage);
 	}
@@ -69,7 +69,7 @@ public class AreaServiceImpl extends ServiceImpl<AreaDao, AreaEntity> implements
 
 	@Override
 	public Integer checkArea(String name) {
-		return super.selectCount(new EntityWrapper<AreaEntity>().eq("name", name));
+		return super.selectCount(new QueryWrapper<AreaEntity>().eq("name", name));
 	}
 
 }

src/main/java/com/govmade/modules/system/service/impl/DepartServiceImpl.java

 package com.govmade.modules.system.service.impl;
 
 import java.util.Map;
-import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.govmade.common.utils.Constant;
 import com.govmade.common.utils.PageUtils;
 import com.govmade.common.utils.Query;
@@ -31,8 +30,8 @@ public class DepartServiceImpl extends ServiceImpl<DepartDao,DepartEntity> imple
 	public PageUtils queryPage(Map<String, Object> params) {
 		
 		String name = (String) params.get("name");
-		Page<DepartEntity> page = this.selectPage(new Query<DepartEntity>(params).getPage(),
-				new EntityWrapper<DepartEntity>()
+		IPage<DepartEntity> page = this.selectPage(new Query<DepartEntity>(params).getPage(),
+				new QueryWrapper<DepartEntity>()
 				.like(StrUtil.isNotBlank(name), "name", name));
 		return new PageUtils(page);
 	}
@@ -51,7 +50,7 @@ public class DepartServiceImpl extends ServiceImpl<DepartDao,DepartEntity> imple
     
     @Override
 	public Integer checkDepart(String name) {
-		return super.selectCount(new EntityWrapper<DepartEntity>().eq("name",name));
+		return super.selectCount(new QueryWrapper<DepartEntity>().eq("name",name));
 	}
 
 }

src/main/java/com/govmade/modules/system/service/impl/DictServiceImpl.java

@@ -6,13 +6,10 @@ import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.govmade.common.utils.PageTreeUtils;
-import com.govmade.common.utils.PageUtils;
-import com.govmade.common.utils.Query;
 import com.govmade.modules.system.dao.DictDao;
 import com.govmade.modules.system.entity.DictEntity;
 import com.govmade.modules.system.service.DictService;
@@ -41,7 +38,7 @@ public class DictServiceImpl extends ServiceImpl<DictDao, DictEntity> implements
 		params.put("start", start);
 		List<DictEntity> allList=this.baseMapper.listTree(params);
 		List<DictEntity> list=buildAreaTree(allList,0L);
-		int totalCount = super.selectCount(new EntityWrapper<DictEntity>().like(StrUtil.isNotBlank(name), "name", name)
+		int totalCount = super.selectCount(new QueryWrapper<DictEntity>().like(StrUtil.isNotBlank(name), "name", name)
 				.eq("pid", 0).eq("state", 1));
 		return new PageTreeUtils(list,totalCount,pageSize,currPage);
 
@@ -66,7 +63,7 @@ public class DictServiceImpl extends ServiceImpl<DictDao, DictEntity> implements
 	public DictEntity queryOne(Map<String, Object> params) {
 		String value = (String) params.get("value");
 		return (DictEntity) this
-				.selectOne(new EntityWrapper<DictEntity>().eq(StrUtil.isNotBlank(value), "value", value));
+				.selectOne(new QueryWrapper<DictEntity>().eq(StrUtil.isNotBlank(value), "value", value));
 	}
 
 	@Override
@@ -89,7 +86,7 @@ public class DictServiceImpl extends ServiceImpl<DictDao, DictEntity> implements
 	
 	@Override
 	public Integer checkDict(String name) {
-		return super.selectCount(new EntityWrapper<DictEntity>().eq("name",name));
+		return super.selectCount(new QueryWrapper<DictEntity>().eq("name",name));
 	}
 	
 	@Override

src/main/java/com/govmade/modules/system/service/impl/MenuServiceImpl.java

@@ -6,11 +6,10 @@ import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
 import com.govmade.common.utils.PageTreeUtils;
-import com.govmade.common.utils.PageUtils;
 import com.govmade.modules.system.dao.MenuDao;
 import com.govmade.modules.system.entity.MenuEntity;
 import com.govmade.modules.system.service.MenuService;
@@ -39,7 +38,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuDao, MenuEntity> implements
 		params.put("start", start);
 		List<MenuEntity> allList=this.baseMapper.listTree(params);
 		List<MenuEntity> list=buildAreaTree(allList,0L);
-		int totalCount = super.selectCount(new EntityWrapper<MenuEntity>().like(StrUtil.isNotBlank(name), "name", name)
+		int totalCount = super.selectCount(new QueryWrapper<MenuEntity>().like(StrUtil.isNotBlank(name), "name", name)
 				.eq("pid", 0).eq("state", 1));
 		return new PageTreeUtils(list,totalCount,pageSize,currPage);
 
@@ -77,7 +76,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuDao, MenuEntity> implements
 
 	@Override
 	public Integer checkMenu(String name) {
-		return super.selectCount(new EntityWrapper<MenuEntity>().eq("name", name));
+		return super.selectCount(new QueryWrapper<MenuEntity>().eq("name", name));
 	}
 
 	@Override

src/main/java/com/govmade/modules/system/service/impl/ModuleServiceImpl.java

@@ -6,9 +6,9 @@ import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.govmade.common.utils.PageUtils;
 import com.govmade.common.utils.Query;
 import com.govmade.modules.system.dao.ModuleDao;
@@ -32,8 +32,8 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleDao, ModuleEntity> impl
 	public PageUtils queryPage(Map<String, Object> params) {
 		
 		String name = (String) params.get("name");
-		Page<ModuleEntity> page = this.selectPage(new Query<ModuleEntity>(params).getPage(),
-				new EntityWrapper<ModuleEntity>()
+		IPage<ModuleEntity> page = this.selectPage(new Query<ModuleEntity>(params).getPage(),
+				new QueryWrapper<ModuleEntity>()
 				.like(StrUtil.isNotBlank(name), "name", name));
 		return new PageUtils(page);
 	}
@@ -41,7 +41,7 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleDao, ModuleEntity> impl
 	@Override
 	public List<ModuleEntity> queryModuleList(){
 		
-		return super.selectList(new EntityWrapper<ModuleEntity>().eq("state", 1));		
+		return super.selectList(new QueryWrapper<ModuleEntity>().eq("state", 1));		
 	}
 	
 	@Override
@@ -56,6 +56,6 @@ public class ModuleServiceImpl extends ServiceImpl<ModuleDao, ModuleEntity> impl
 	
 	@Override
 	public Integer checkModule(String name) {
-		return super.selectCount(new EntityWrapper<ModuleEntity>().eq("name", name));
+		return super.selectCount(new QueryWrapper<ModuleEntity>().eq("name", name));
 	}
 }

src/main/java/com/govmade/modules/system/service/impl/RoleServiceImpl.java

@@ -5,9 +5,9 @@ import java.util.Set;
 
 import org.springframework.stereotype.Service;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.govmade.common.utils.PageUtils;
 import com.govmade.common.utils.Query;
 import com.govmade.modules.system.dao.RoleDao;
@@ -29,8 +29,8 @@ public class RoleServiceImpl extends ServiceImpl<RoleDao, RoleEntity> implements
 	public PageUtils queryPage(Map<String, Object> params) {
 		
 		String name = (String) params.get("name");
-		Page<RoleEntity> page = this.selectPage(new Query<RoleEntity>(params).getPage(),
-				new EntityWrapper<RoleEntity>()
+		IPage<RoleEntity> page = this.selectPage(new Query<RoleEntity>(params).getPage(),
+				new QueryWrapper<RoleEntity>()
 				.like(StrUtil.isNotBlank(name), "name", name));
 		return new PageUtils(page);
 	}
@@ -47,7 +47,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleDao, RoleEntity> implements
 	
 	@Override
 	public Integer checkRole(String name) {
-		return super.selectCount(new EntityWrapper<RoleEntity>().eq("name",name));
+		return super.selectCount(new QueryWrapper<RoleEntity>().eq("name",name));
 	}
 	
 }

src/main/java/com/govmade/modules/system/service/impl/UserServiceImpl.java

@@ -4,15 +4,18 @@ import java.util.Map;
 import java.util.Set;
 
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.govmade.common.utils.PageUtils;
 import com.govmade.common.utils.Query;
 import com.govmade.modules.system.dao.UserDao;
 import com.govmade.modules.system.entity.UserEntity;
 import com.govmade.modules.system.service.UserService;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 
 /**
@@ -29,12 +32,12 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 	public PageUtils queryPage(Map<String, Object> params) {
 		// TODO Auto-generated method stub
 		String username = (String) params.get("username");
-		Long createBy = (Long) params.get("createBy");
 		Long deptId = (Long) params.get("deptId");
 
-		Page<UserEntity> page = this.selectPage(new Query<UserEntity>(params).getPage(),
-				new EntityWrapper<UserEntity>().like(StrUtil.isNotBlank(username), "username", username)
-						.eq(deptId != null, "dept_id", deptId).eq(createBy != null, "create_by", createBy));
+		IPage<UserEntity> page = this.selectPage(new Query<UserEntity>(params).getPage(),
+				new QueryWrapper<UserEntity>().like(StrUtil.isNotBlank(username), "username", username)
+						.eq(ObjectUtil.isNotNull(deptId), "dept_id", deptId));
+
 		return new PageUtils(page);
 	}
 
@@ -50,7 +53,8 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 
 	@Override
 	public void deleteBatch(Set<Long> ids) {
-		this.baseMapper.deleteBatch(ids);
+		super.update(null, new UpdateWrapper<UserEntity>().in("id", ids));
+		//this.baseMapper.deleteBatch(ids);
 	}
 
 	@Override
@@ -61,18 +65,18 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
 
 	@Override
 	public Integer checkUser(String username) {
-		return super.selectCount(new EntityWrapper<UserEntity>().eq("username", username));
+		return super.selectCount(new QueryWrapper<UserEntity>().eq("username", username));
 	}
 
 	@Override
 	public UserEntity queryOne(Map<String, Object> params) {
 		String username = (String) params.get("username");
 		return (UserEntity) this
-				.selectOne(new EntityWrapper<UserEntity>().eq(StrUtil.isNotBlank(username), "username", username));
+				.selectOne(new QueryWrapper<UserEntity>().eq(StrUtil.isNotBlank(username), "username", username));
 	}
-	
+
 	@Override
 	public Integer userCount(Long id) {
-		return super.selectCount(new EntityWrapper<UserEntity>().eq("dept_id", id));				
+		return super.selectCount(new QueryWrapper<UserEntity>().eq("dept_id", id));
 	}
 }

src/main/resources/application.yml

@@ -37,7 +37,7 @@ spring:
 
 #mybatis
 mybatis-plus:
-  mapper-locations: classpath:mapper/**/*.xml
+  mapper-locations: classpath:mapper/**/*Dao.xml
   #实体扫描，多个package用逗号或者分号分隔
   typeAliasesPackage: com.govmade.modules.*.entity
   global-config:
@@ -59,7 +59,7 @@ mybatis-plus:
     #自定义填充策略接口实现
     meta-object-handler: com.govmade.common.utils.MyMetaObjectHandler
     #自定义SQL注入器
-    sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector
+    sql-injector: import com.baomidou.mybatisplus.extension.injector.LogicSqlInjector;
   configuration:
     map-underscore-to-camel-case: true
     cache-enabled: false