From cf32d02427cc5a1cece4c9c6ea2e79ac0ca04dca Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 31 Dec 2025 09:02:00 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hxhq/business/controller/PublicController.java | 39 ++++++++++++++++++++++
 .../service/impl/StudyFormPreServiceImpl.java      | 11 ++++--
 .../mapper/business/StudyFormPreMapper.xml         |  2 +-
 3 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
new file mode 100644
index 0000000..563ece6
--- /dev/null
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
@@ -0,0 +1,39 @@
+package com.hxhq.business.controller;
+
+import com.hxhq.business.domain.Template;
+import com.hxhq.business.service.ITemplateService;
+import com.hxhq.common.core.web.controller.BaseController;
+import com.hxhq.common.core.web.domain.AjaxResult;
+import com.hxhq.common.core.web.page.TableDataInfo;
+import com.hxhq.common.security.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+/**
+ * 公共Controller
+ *
+ * @author hxhq
+ * @date 2025-12-23
+ */
+@RestController
+@RequestMapping("/business/public")
+public class PublicController extends BaseController
+{
+    @Autowired
+    private ITemplateService templateService;
+
+    /**
+     * 查询模板列表
+     */
+    @GetMapping("/templateList")
+    public TableDataInfo list(Template template)
+    {
+        startPage();
+        List<Template> list = templateService.queryList(template);
+        return getDataTable(list);
+    }
+
+}
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
index d8910da..c6105d3 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
@@ -74,11 +74,16 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
             if(studyFormPreOld==null){
                 throw  new SecurityException("信息不存在或已删除");
             }
-            if(SecurityUtils.getUserId().equals(studyFormPreOld.getUserId())){
+            if(!SecurityUtils.getUserId().equals(studyFormPreOld.getUserId())){
                 throw  new SecurityException("只能操作自己的表单");
             }
-            this.updateById(studyFormPre);
+            studyFormPreOld.setBdmc(studyFormPre.getBdmc());
+            studyFormPreOld.setTemplateMc(studyFormPre.getTemplateMc());
+            studyFormPreOld.setTemplateId(studyFormPre.getTemplateId());
+            studyFormPreOld.setBdnr(studyFormPre.getBdnr());
+            this.updateById(studyFormPreOld);
         }else{
+            studyFormPre.setBdbh("todo");
             studyFormPre.setUserId(SecurityUtils.getUserId());
             studyFormPre.setUserMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
             studyFormPre.setBdzt(StudyFormPreBdztEnum.tbz.getValue());
@@ -98,7 +103,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl<StudyFormPreMapper, Stu
             if(studyFormPreOld==null){
                 throw  new SecurityException("信息不存在或已删除");
             }
-            if(SecurityUtils.getUserId().equals(studyFormPreOld.getUserId())){
+            if(!SecurityUtils.getUserId().equals(studyFormPreOld.getUserId())){
                 throw  new SecurityException("只能操作自己的表单");
             }
             studyFormPre.setBdzt(StudyFormPreBdztEnum.ytj.getValue());
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml
index fc5f520..70f0380 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.StudyFormPreMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormPreListDto">
-        select t.id,t.bdbh,t.bdmc,t.template_mc,t.create_time,t.user_mc,t.bdzt
+        select t.id,t.bdbh,t.bdmc,t.template_mc,t.create_time,t.user_mc,t.bdzt,t.bdzt
         FROM `t_study_form_pre` t
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>