From 70847d17f10a513a212348ab83806de1d7dd240c Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Sat, 23 Mar 2024 21:22:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=A7=AF=E6=9C=A8?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90d46a27..94176c3e 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ 1.9.6 - 1.7.2-beta + 1.7.3 2.11.0 2.6 2.1.0 From f3cf90bd28acd6b49d656c9f8c4188254fc3d858 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Mon, 25 Mar 2024 09:42:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9C=A8=E7=A7=9F=E6=88=B7=E4=B8=8D?= =?UTF-8?q?=E9=9A=94=E7=A6=BB=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E9=83=A8=E9=97=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/system/controller/SysDepartController.java | 3 ++- .../org/jeecg/modules/system/service/ISysDepartService.java | 2 +- .../modules/system/service/impl/SysDepartServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index a529ada6..f9fa6e41 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/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 sysDepartExportVos = sysDepartService.getExportDepart(sysDepart.getTenantId()); + Integer tenantId = sysDepart == null ? null : sysDepart.getTenantId(); + List sysDepartExportVos = sysDepartService.getExportDepart(tenantId); //导出文件名称 mv.addObject(NormalExcelConstants.FILE_NAME, "部门列表"); mv.addObject(NormalExcelConstants.CLASS, SysDepartExportVo.class); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java index a22273ed..04caf35e 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java +++ b/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{ * @param tenantId * @return */ - List getExportDepart(int tenantId); + List getExportDepart(Integer tenantId); /** * 导出系统部门excel diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java index 7c58ffc7..edbc814b 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java +++ b/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 getExportDepart(int tenantId) { + public List getExportDepart(Integer tenantId) { //获取父级部门 List parentDepart = departMapper.getSysDepartList("", tenantId); //子部门 From c9c6dd5c1dd096434f7eb79ba54b050c352aac88 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Thu, 28 Mar 2024 14:44:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?Online=E8=A1=A8=E5=8D=95=E4=B8=AD=20?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=90=9C=E7=B4=A2=E6=A1=86=20=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E6=97=B6=E6=8A=A5sql=E9=94=99=E8=AF=AF=EF=BC=8C?= =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84SQL=E5=A4=9A=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=20=E2=80=9Cand"=20#5978=20=E5=AD=97=E5=85=B8=E4=B8=8B?= =?UTF-8?q?=E6=8B=89=E5=BC=82=E6=AD=A5=E5=87=BA=E9=94=99=20#1108?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SysDictServiceImpl.java | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java index efa3f5bd..db94bd7f 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDictServiceImpl.java +++ b/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 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 impl } //下拉搜索组件 支持传入排序信息 查询排序 - if(oConvertUtils.isNotEmpty(condition) && oConvertUtils.isNotEmpty(keywordSql)){ - filterSql += sqlWhere + sqlAnd + condition + sqlAnd + keywordSql; - }else if(oConvertUtils.isNotEmpty(condition)){ - filterSql += sqlWhere + sqlAnd + condition; - }else if(oConvertUtils.isNotEmpty(keywordSql)){ - filterSql += sqlWhere + sqlAnd + keywordSql; - } else if (tableHasWhere){ - filterSql += sqlWhere; - } - + //update-begin---author:chenrui ---date:20240327 for：[QQYUN-8514]Online表单中 下拉搜索框 搜索时报sql错误，生成的SQL多了一个 “and" ------------ + if (oConvertUtils.isNotEmpty(condition) && oConvertUtils.isNotEmpty(keywordSql)) { + filterSql += sqlWhere + (tableHasWhere ? sqlAnd : " ") + condition + sqlAnd + keywordSql; + } else if (oConvertUtils.isNotEmpty(condition)) { + filterSql += sqlWhere + (tableHasWhere ? sqlAnd : " ") + condition; + } else if (oConvertUtils.isNotEmpty(keywordSql)) { + filterSql += sqlWhere + (tableHasWhere ? sqlAnd : " ") + keywordSql; + } 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 impl sysDict.setId(id); baseMapper.updateById(sysDict); this.updateDictItem(id,sysDictVo.getDictItemsList()); + // 删除字典缓存 + redisUtil.removeAll(CacheConstant.SYS_DICT_CACHE + "::" + dict.getDictCode()); } /** From ac93bf7d6b5ea5d334aaed3c6b7a86da4bc3bd08 Mon Sep 17 00:00:00 2001 From: JEECG <445654970@qq.com> Date: Mon, 1 Apr 2024 13:47:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=A7=AF=E6=9C=A8?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=88=B01.7.4=EF=BC=8C=E5=8D=87=E7=BA=A7drui?= =?UTF-8?q?d=E5=88=B01.2.22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-module-system/jeecg-system-biz/pom.xml | 6 ++++++ pom.xml | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-module-system/jeecg-system-biz/pom.xml index f391a333..14d2ede3 100644 --- a/jeecg-module-system/jeecg-system-biz/pom.xml +++ b/jeecg-module-system/jeecg-system-biz/pom.xml @@ -33,6 +33,12 @@ org.jeecgframework.jimureport jimureport-spring-boot-starter + + + jsqlparser + com.github.jsqlparser + + org.jeecgframework.jimureport diff --git a/pom.xml b/pom.xml index 94176c3e..23d937e9 100644 --- a/pom.xml +++ b/pom.xml @@ -53,11 +53,11 @@ 3.5.3.1 4.1.3 - 1.2.19 - 1.9.6 + 1.2.22 + 1.9.10 - 1.7.3 + 1.7.4 2.11.0 2.6 2.1.0