fix: sql条件非空判断

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmScorePackageController.java

@@ -2624,6 +2624,7 @@ public class WmScorePackageController {
 		List<WmScorePackage> pageRecords = wmScorePackagePage.getRecords();
 
 		if (CollUtil.isNotEmpty(pageRecords)) {
+			long buildStartMillis = System.currentTimeMillis();
 			List<Future<WmScorePackage>> futureList = new ArrayList<>(pageRecords.size());
 
 			for (WmScorePackage scorePackage : pageRecords) {
@@ -2644,8 +2645,8 @@ public class WmScorePackageController {
 				log.error("获取分页信息失败", e);
 				return R.failed("获取分页信息失败");
 			}
+			log.info("build积分包耗时:{}", System.currentTimeMillis() - buildStartMillis);
 		}
-		log.info("build积分包耗时:{}", System.currentTimeMillis() - startMillis);
 
 		return R.ok(wmScorePackagePage);
 	}

hnqz-upms/hnqz-upms-biz/src/main/resources/mapper/WmTaskMapper.xml

@@ -998,7 +998,7 @@
 		<if test="query.taskUserId!=null and query.taskUserId!=''">
 			and  t.task_user_id = #{query.taskUserId}
 		</if>
-		<if test="query.taskTypeId != null">
+		<if test="query.taskTypeId != null and query.taskTypeId != ''">
 			and  t.task_type_id = #{query.taskTypeId}
 		</if>
 		order by t.lookinto_date