⬆️ Upgrading dependencies. #3216 MybatisPlus升级到3.4.3.4版本

pigx-common/pigx-common-bom/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>group.springframework</groupId>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
-		<version>2020.0.3</version>
+		<version>2020.0.4</version>
 		<relativePath/>
 	</parent>
 
@@ -17,10 +17,10 @@
 	<description>pigx 公共版本控制</description>
 
 	<properties>
-		<pigx.version>4.1.0</pigx.version>
-		<mybatis-plus.version>3.4.3</mybatis-plus.version>
+		<pigx.version>4.2.0</pigx.version>
+		<mybatis-plus.version>3.4.3.4</mybatis-plus.version>
 		<dynamic-ds.version>3.4.1</dynamic-ds.version>
-		<druid.version>1.2.5</druid.version>
+		<druid.version>1.2.8</druid.version>
 		<mysql.connector.version>8.0.23</mysql.connector.version>
 		<swagger.core.version>1.5.22</swagger.core.version>
 		<mp.weixin.version>3.9.0</mp.weixin.version>
@@ -226,12 +226,6 @@
 				<artifactId>jsoup</artifactId>
 				<version>${jsoup.version}</version>
 			</dependency>
-			<!-- excel 导入导出 https://github.com/pig-mesh/excel-spring-boot-starter -->
-			<dependency>
-				<groupId>com.pig4cloud.excel</groupId>
-				<artifactId>excel-spring-boot-starter</artifactId>
-				<version>${excel.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/DataScopeSqlInjector.java

@@ -2,6 +2,7 @@ package com.pig4cloud.pigx.common.data.datascope;
 
 import com.baomidou.mybatisplus.core.injector.AbstractMethod;
 import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector;
+import com.baomidou.mybatisplus.core.metadata.TableInfo;
 import com.baomidou.mybatisplus.extension.injector.methods.InsertBatchSomeColumn;
 
 import java.util.List;
@@ -15,8 +16,8 @@ import java.util.List;
 public class DataScopeSqlInjector extends DefaultSqlInjector {
 
 	@Override
-	public List<AbstractMethod> getMethodList(Class<?> mapperClass) {
-		List<AbstractMethod> methodList = super.getMethodList(mapperClass);
+	public List<AbstractMethod> getMethodList(Class<?> mapperClass, TableInfo tableInfo) {
+		List<AbstractMethod> methodList = super.getMethodList(mapperClass, tableInfo);
 		methodList.add(new SelectListByScope());
 		methodList.add(new SelectPageByScope());
 		methodList.add(new SelectCountByScope());

pigx-common/pigx-common-data/src/main/java/com/pig4cloud/pigx/common/data/datascope/SelectCountByScope.java

@@ -23,7 +23,7 @@ public class SelectCountByScope extends AbstractMethod {
 				this.sqlComment());
 		SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass);
 
-		return this.addSelectMappedStatementForOther(mapperClass, "selectCountByScope", sqlSource, Integer.class);
+		return this.addSelectMappedStatementForOther(mapperClass, "selectCountByScope", sqlSource, Long.class);
 	}
 
 }

pigx-visual/pigx-daemon-quartz/src/main/java/com/pig4cloud/pigx/daemon/quartz/controller/SysJobController.java

@@ -149,7 +149,7 @@ public class SysJobController {
 	@ApiOperation(value = "暂停全部定时任务")
 	public R shutdownJobs() {
 		taskUtil.pauseJobs(scheduler);
-		int count = this.sysJobService
+		long count = this.sysJobService
 				.count(new LambdaQueryWrapper<SysJob>().eq(SysJob::getJobStatus, JOB_STATUS_RUNNING.getType()));
 		if (count <= 0) {
 			return R.ok("无正在运行定时任务");