Merge remote-tracking branch 'origin/dev' into dev

SQL/202511/20251112/z_exec_last.sql

@@ -0,0 +1,9 @@
+update "LOWCODE_FRAME"."LOWCODE_DBFORM"
+set IS_DB_SYNC='N'
+where TABLE_NAME in ('lc_confined_space_operation',
+                     'lc_fire_operation', 'lc_high_operation',
+                     'lc_item_result', 'lc_land_operation',
+                     'lc_lifting_operation', 'lc_outside_person',
+                     'lc_risk_hazard_manage', 'lc_risk_identify_assessment',
+                     'lc_temporary_power_operation', 'lc_todo_request_info',
+                     'lc_work_item');

jeelowcode-admin/src/main/resources/application-office.yaml

@@ -33,8 +33,8 @@ spring:
   # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优
   redis:
     host: redis # 地址
-    #    port: 6379 # 端口
+    port: 6379 # 端口
-    #    database: 10 # 数据库索引
+    database: 0 # 数据库索引
     #  password: 123456 # 密码，建议生产环境开启
 
 

jeelowcode-core/src/main/java/com/jeelowcode/core/framework/mapper/JeeLowCodeSqlMapper.java

@@ -6,6 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.Master;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jeelowcode.framework.tenant.annotation.JeeLowCodeTenantIgnore;
 import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.mapping.StatementType;
 
 import java.util.List;
 import java.util.Map;

jeelowcode-service/jeelowcode-service-bpm-biz/src/main/java/com/jeelowcode/service/bpm/controller/BpmProcessInstanceController.java

@@ -1,12 +1,9 @@
 package com.jeelowcode.service.bpm.controller;
 
 import com.jeelowcode.core.framework.controller.BaseController;
-import com.jeelowcode.core.framework.enums.ApproveStatusEnum;
 import com.jeelowcode.framework.utils.model.ResultDataModel;
-import com.jeelowcode.framework.utils.tool.CollectionUtil;
 import com.jeelowcode.framework.utils.tool.NumberUtil;
 import com.jeelowcode.service.bpm.controller.vo.instance.*;
-import com.jeelowcode.service.bpm.controller.vo.process.BpmProcessDefinitionRespVO;
 import com.jeelowcode.service.bpm.service.IBpmProcessInstanceService;
 import com.jeelowcode.tool.framework.common.pojo.CommonResult;
 import com.jeelowcode.tool.framework.common.pojo.PageResult;
@@ -19,9 +16,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
 import java.util.HashMap;
-import java.util.List;
 import java.util.Objects;
 
 import static com.jeelowcode.tool.framework.common.pojo.CommonResult.success;
@@ -37,7 +32,7 @@ public class BpmProcessInstanceController extends BaseController {
     private IBpmProcessInstanceService processInstanceService;
 
     @GetMapping("/my-page")
-    @Operation(tags = "流程管理",summary = "获得我的实例分页列表", description = "在【我的流程】菜单中，进行调用")
+    @Operation(tags = "流程管理", summary = "获得我的实例分页列表", description = "在【我的流程】菜单中，进行调用")
     @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
     public CommonResult<PageResult<BpmProcessInstancePageItemRespVO>> getMyProcessInstancePage(
             @Valid BpmProcessInstanceMyPageReqVO pageReqVO) {
@@ -45,19 +40,19 @@ public class BpmProcessInstanceController extends BaseController {
     }
 
     @PostMapping("/create")
-    @Operation(tags = "流程管理",summary = "新建流程实例")
+    @Operation(tags = "流程管理", summary = "新建流程实例")
     @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
     public CommonResult<String> createProcessInstance(@Valid @RequestBody BpmProcessInstanceCreateReqVO createReqVO) {
         return success(processInstanceService.createProcessInstance(getLoginUserId(), createReqVO));
     }
 
     @PostMapping("/listCreate")
-    @Operation(tags = "流程管理",summary = "新建流程实例")
+    @Operation(tags = "流程管理", summary = "新建流程实例")
     @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
     public CommonResult<String> createListProcessInstance(@Valid @RequestBody BpmProcessInstanceCreateReqVO createReqVO) {
-        ResultDataModel dataDetail = super.getDataDetail(NumberUtil.toLong(createReqVO.getDbFormId()),NumberUtil.toLong(createReqVO.getDataId()),new HashMap<String,Object>());
+        ResultDataModel dataDetail = super.getDataDetail(NumberUtil.toLong(createReqVO.getDbFormId()), NumberUtil.toLong(createReqVO.getDataId()), new HashMap<String, Object>());
-        if(Objects.nonNull(dataDetail)){
+        if (Objects.nonNull(dataDetail)) {
-            dataDetail.getRecords().get(0).put("approveStatusName","");
+            dataDetail.getRecords().get(0).put("approveStatusName", "");
             createReqVO.setVariables(dataDetail.getRecords().get(0));
         }
 
@@ -65,9 +60,8 @@ public class BpmProcessInstanceController extends BaseController {
     }
 
 
-
     @PostMapping("/createV2")
-    @Operation(tags = "流程管理",summary = "新建流程实例(自定义流程发起使用)")
+    @Operation(tags = "流程管理", summary = "新建流程实例(自定义流程发起使用)")
     @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
     public CommonResult<String> createProcessInstanceV2(@Valid @RequestBody BpmProcessInstanceCreateReqVO createReqVO) {
         return success(processInstanceService.createProcessInstanceV2(getLoginUserId(), createReqVO));
@@ -75,7 +69,7 @@ public class BpmProcessInstanceController extends BaseController {
 
 
     @GetMapping("/get")
-    @Operation(tags = "流程管理",summary = "获得指定流程实例", description = "在【流程详细】界面中，进行调用")
+    @Operation(tags = "流程管理", summary = "获得指定流程实例", description = "在【流程详细】界面中，进行调用")
     @Parameter(name = "id", description = "流程实例的编号", required = true)
     @PreAuthorize("@ss.hasPermission('bpm:process-instance:query')")
     public CommonResult<BpmProcessInstanceRespVO> getProcessInstance(@RequestParam("id") String id) {
@@ -83,7 +77,7 @@ public class BpmProcessInstanceController extends BaseController {
     }
 
     @DeleteMapping("/cancel")
-    @Operation(tags = "流程管理",summary = "取消流程实例", description = "撤回发起的流程")
+    @Operation(tags = "流程管理", summary = "取消流程实例", description = "撤回发起的流程")
     @PreAuthorize("@ss.hasPermission('bpm:process-instance:cancel')")
     public CommonResult<Boolean> cancelProcessInstance(@Valid @RequestBody BpmProcessInstanceCancelReqVO cancelReqVO) {
         processInstanceService.cancelProcessInstance(getLoginUserId(), cancelReqVO);