Merge branch 'master' into master

jeecg-module-system/jeecg-system-biz/pom.xml

@@ -33,6 +33,12 @@
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
 			<artifactId>jimureport-spring-boot-starter</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>jsqlparser</artifactId>
+					<groupId>com.github.jsqlparser</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -365,7 +365,8 @@ public class SysDepartController {
 			//}
 		//});
 		//step.2 组装导出数据
-		List<SysDepartExportVo> sysDepartExportVos = sysDepartService.getExportDepart(sysDepart.getTenantId());
+		Integer tenantId = sysDepart == null ? null : sysDepart.getTenantId();
+		List<SysDepartExportVo> sysDepartExportVos = sysDepartService.getExportDepart(tenantId);
         //导出文件名称
         mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表");
         mv.addObject(NormalExcelConstants.CLASS, SysDepartExportVo.class);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -223,7 +223,7 @@ public interface ISysDepartService extends IService<SysDepart>{
      * @param tenantId
      * @return
      */
-    List<SysDepartExportVo> getExportDepart(int tenantId);
+    List<SysDepartExportVo> getExportDepart(Integer tenantId);
 
     /**
      * 导出系统部门excel

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -1220,7 +1220,7 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 	 * @return
 	 */
 	@Override
-	public List<SysDepartExportVo> getExportDepart(int tenantId) {
+	public List<SysDepartExportVo> getExportDepart(Integer tenantId) {
 		//获取父级部门
 		List<SysDepartExportVo> parentDepart = departMapper.getSysDepartList("", tenantId);
 		//子部门

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java

@@ -21,6 +21,7 @@ import org.jeecg.common.system.vo.DictModel;
 import org.jeecg.common.system.vo.DictModelMany;
 import org.jeecg.common.system.vo.DictQuery;
 import org.jeecg.common.util.CommonUtils;
+import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.SqlInjectionUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
@@ -67,6 +68,9 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 	@Lazy
 	@Autowired
 	private ISysBaseAPI sysBaseAPI;
+	@Lazy
+	@Autowired
+	private RedisUtil redisUtil;
 
 	@Override
 	public boolean duplicateCheckData(DuplicateCheckVo duplicateCheckVo) {
@@ -565,16 +569,17 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 		}
 		
 		//下拉搜索组件 支持传入排序信息 查询排序
-		if(oConvertUtils.isNotEmpty(condition) && oConvertUtils.isNotEmpty(keywordSql)){
+		//update-begin---author:chenrui ---date:20240327  for：[QQYUN-8514]Online表单中 下拉搜索框 搜索时报sql错误，生成的SQL多了一个 “and" ------------
-			filterSql += sqlWhere + sqlAnd + condition + sqlAnd + keywordSql;
+        if (oConvertUtils.isNotEmpty(condition) && oConvertUtils.isNotEmpty(keywordSql)) {
-		}else if(oConvertUtils.isNotEmpty(condition)){
+            filterSql += sqlWhere + (tableHasWhere ? sqlAnd : " ") + condition + sqlAnd + keywordSql;
-			filterSql += sqlWhere + sqlAnd + condition;
+        } else if (oConvertUtils.isNotEmpty(condition)) {
-		}else if(oConvertUtils.isNotEmpty(keywordSql)){
+            filterSql += sqlWhere + (tableHasWhere ? sqlAnd : " ") + condition;
-			filterSql += sqlWhere + sqlAnd + keywordSql;
+        } else if (oConvertUtils.isNotEmpty(keywordSql)) {
-		} else if (tableHasWhere){
+            filterSql += sqlWhere + (tableHasWhere ? sqlAnd : " ") + keywordSql;
-			filterSql += sqlWhere; 
+        } else if (tableHasWhere) {
-		}
+            filterSql += sqlWhere;
-		
+        }
+		//update-end---author:chenrui ---date:20240327  for：[QQYUN-8514]Online表单中 下拉搜索框 搜索时报sql错误，生成的SQL多了一个 “and" ------------
 		// 增加排序逻辑
 		if (oConvertUtils.isNotEmpty(orderField)) {
 			filterSql += " order by " + orderField + " " + orderType;
@@ -818,6 +823,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
 		sysDict.setId(id);
 		baseMapper.updateById(sysDict);
 		this.updateDictItem(id,sysDictVo.getDictItemsList());
+		// 删除字典缓存
+		redisUtil.removeAll(CacheConstant.SYS_DICT_CACHE + "::" + dict.getDictCode());
 	}
 
 	/**

pom.xml

@@ -54,10 +54,11 @@
 		<mybatis-plus.version>3.5.3.1</mybatis-plus.version>
 		<dynamic-datasource-spring-boot-starter.version>4.1.3</dynamic-datasource-spring-boot-starter.version>
 		<druid.version>1.2.22</druid.version>
-		<minidao.version>1.9.6</minidao.version>
+		<minidao.version>1.9.10</minidao.version>
+
 
 		<!-- 积木报表-->
-		<jimureport-spring-boot-starter.version>1.7.2-beta</jimureport-spring-boot-starter.version>
+		<jimureport-spring-boot-starter.version>1.7.4</jimureport-spring-boot-starter.version>
 		<commons-io.version>2.11.0</commons-io.version>
 		<commons.version>2.6</commons.version>
 		<aliyun-java-sdk-dysmsapi.version>2.1.0</aliyun-java-sdk-dysmsapi.version>