Merge branch 'refs/heads/dev' into test

pom.xml

@@ -19,7 +19,7 @@
     <url>https://github.com/YunaiV/ruoyi-vue-pro</url>
 
     <properties>
-        <revision>3.0.37</revision>
+        <revision>3.0.38</revision>
         <!-- Maven 相关 -->
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/CompanyRelativityController.java

@@ -92,4 +92,10 @@ public class CompanyRelativityController {
         return success(BeanUtils.toBean(pageResult, CompanyRelaDeptDO.class));
     }
 
+    @PostMapping("/createOrUpdate-list")
+    @Operation(summary = "批量创建更新公司关系")
+    @PreAuthorize("@ss.hasPermission('base:company-relativity:create')")
+    public CommonResult<List<CompanyRelativityRespVO>> createOrUpdataCompanyList(@Valid @RequestBody List<CompanyRelativitySaveReqVO> createReqVOS) {
+        return success(companyRelativityService.createOrUpdataCompanyList(createReqVOS));
+    }
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactPageReqVO.java

@@ -35,4 +35,6 @@ public class ContactPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "是否启用")
+    private String isEnable;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactRespVO.java

@@ -44,4 +44,7 @@ public class ContactRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "是否启用")
+    @ExcelProperty("是否启用")
+    private String isEnable;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ContactSaveReqVO.java

@@ -33,4 +33,7 @@ public class ContactSaveReqVO {
     @NotEmpty(message = "联系地址不能为空")
     private String address;
 
+    @Schema(description = "是否启用")
+    private String isEnable;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/TemplateInstanceController.java

@@ -166,7 +166,7 @@ public class TemplateInstanceController extends AbstractFileUploadController {
     //根据id获取实例版本号
     @GetMapping("/get-version")
     @Operation(summary = "根据id获取实例版本号")
-    public CommonResult<Map<String,Object>> getVersion(@RequestParam("id") String id) {
+    public CommonResult<Map<String,Object>> getVersion(@Valid @NotEmpty(message = "模版实例id不能为空") @RequestParam("id") String id) {
         return success(templateInstanceService.getVersion(id));
     }
 

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/controller/OnlyOfficeCallbackController.java

@@ -6,6 +6,7 @@ import com.zt.plat.module.base.controller.admin.templtp.onlyoffice.pojo.OnlyOffi
 import com.zt.plat.module.base.controller.admin.templtp.onlyoffice.service.OnlyOfficeCallbackService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.annotation.security.PermitAll;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -33,7 +34,6 @@ public class OnlyOfficeCallbackController {
     public ResponseEntity<Map<String, Integer>> handleCallback(@RequestBody OnlyOfficeCallback callback, @PathVariable String id) {
         // 处理回调逻辑
         callbackService.processCallback(callback,id);
-
         // 返回必须的响应，否则OnlyOffice会显示错误
         Map<String, Integer> response = new HashMap<>();
         response.put("error", 0);

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/templtp/onlyoffice/service/OnlyOfficeCallbackServiceImpl.java

@@ -143,7 +143,7 @@ public class OnlyOfficeCallbackServiceImpl implements OnlyOfficeCallbackService
             // 2. 获取并验证文件名
             String fileName = file.getOriginalFilename();
 
-            String directory = "template-instance";
+            String directory = "模版实例";
             FileCreateReqDTO fileCreateReqDTO = new FileCreateReqDTO();
             fileCreateReqDTO.setName(fileName);
             fileCreateReqDTO.setContent(file.getBytes());
@@ -152,6 +152,7 @@ public class OnlyOfficeCallbackServiceImpl implements OnlyOfficeCallbackService
 
             // 7. 调用文件服务创建文件
             CommonResult<String> result = fileApi.createFile(fileCreateReqDTO);
+            log.info("文件创建结果：{}", result);
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ContactDO.java

@@ -59,6 +59,11 @@ public class ContactDO extends BusinessBaseDO {
     */
     @TableField("ADR")
     private String address;
+    /**
+     * 是否启用
+     */
+    @TableField("IS_ENB")
+    private String isEnable;
     /**
     * 公司编号
     */

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/FactoryMapper.java

@@ -27,4 +27,5 @@ public interface FactoryMapper extends BaseMapperX<FactoryDO> {
                 .orderByDesc(FactoryDO::getId));
     }
 
+    String selectMaxCode();
 }