111

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/service/Impl/ActBusinessServiceImpl.java

@@ -286,6 +286,8 @@ public class ActBusinessServiceImpl extends ServiceImpl<ActBusinessMapper, ActBu
 
                 QueryWrapper<TbTableInfoPractice> practiceQueryWrapper = new QueryWrapper<>();
                 practiceQueryWrapper.eq("business_table_id", tableId);
+                practiceQueryWrapper.and(i-> i.eq("is_initial","1").or().eq("is_initial",null).or().eq("is_initial",""));
+
                 tableInfoPractice = tbTableInfoPracticeMapper.selectOne(practiceQueryWrapper);
 
                 String pattern = oConvertUtils.getString(actZprocess.getDescription());
@@ -319,6 +321,8 @@ public class ActBusinessServiceImpl extends ServiceImpl<ActBusinessMapper, ActBu
 
                     QueryWrapper<TbTableInfoPractice> practiceQueryWrapper = new QueryWrapper<>();
                     practiceQueryWrapper.eq("business_table_id", actBusiness.getTableId());
+                    practiceQueryWrapper.and(i-> i.eq("is_initial","1").or().eq("is_initial",null).or().eq("is_initial",""));
+
                     tableInfoPractice = tbTableInfoPracticeMapper.selectOne(practiceQueryWrapper);
 
                     String pattern = oConvertUtils.getString(actZprocess.getDescription());

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActBusinessController.java

@@ -623,6 +623,7 @@ public class ActBusinessController {
             }else{
                 QueryWrapper<TbTableInfoPractice> practiceQueryWrapper = new QueryWrapper<>();
                 practiceQueryWrapper.eq("business_table_id", e.getTableId());
+                practiceQueryWrapper.and(i-> i.eq("is_initial","1").or().eq("is_initial",null).or().eq("is_initial",""));
                 tbTableInfoPractice = tbTableInfoPracticeService.getOne(practiceQueryWrapper);
                 if (tbTableInfoPractice != null && oConvertUtils.isNotEmpty(tbTableInfoPractice.getExtraInfo())){
                     e.setDescription(tbTableInfoPractice.getExtraInfo());

jeecg-boot/jeecg-boot-module-activiti/src/main/java/org/jeecg/modules/activiti/web/ActTaskController.java

@@ -164,6 +164,7 @@ public class ActTaskController {
             }else{
                 QueryWrapper<TbTableInfoPractice> practiceQueryWrapper = new QueryWrapper<>();
                 practiceQueryWrapper.eq("business_table_id", actBusiness.getTableId());
+                practiceQueryWrapper.and(i-> i.eq("is_initial","1").or().eq("is_initial",null).or().eq("is_initial",""));
                 tbTableInfoPractice = tbTableInfoPracticeService.getOne(practiceQueryWrapper);
                 if (tbTableInfoPractice != null && oConvertUtils.isNotEmpty(tbTableInfoPractice.getExtraInfo())){
                     tv.setDescription(tbTableInfoPractice.getExtraInfo());
@@ -785,6 +786,8 @@ public class ActTaskController {
                 }else{
                     QueryWrapper<TbTableInfoPractice> practiceQueryWrapper = new QueryWrapper<>();
                     practiceQueryWrapper.eq("business_table_id", actBusiness.getTableId());
+                    practiceQueryWrapper.and(i-> i.eq("is_initial","1").or().eq("is_initial",null).or().eq("is_initial",""));
+
                     tbTableInfoPractice = tbTableInfoPracticeService.getOne(practiceQueryWrapper);
                     if (tbTableInfoPractice != null && oConvertUtils.isNotEmpty(tbTableInfoPractice.getExtraInfo())){
                         htv.setDescription(tbTableInfoPractice.getExtraInfo());