From e928def814e18f7afbdaf06f8f80e57657b9e756 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 21 Jan 2026 10:39:41 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86][=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86]?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hxhq/business/service/impl/ZcgServiceImpl.java | 22 +++++++++++-----------
 .../mapper/business/StudyFormFillMapper.xml        |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java
index 317a46f..18b0564 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ZcgServiceImpl.java
@@ -94,11 +94,11 @@ public class ZcgServiceImpl extends ServiceImpl<ZcgMapper, Zcg> implements IZcgS
             throw new SecurityException("归还人2不存在");
         }
         //验证接收人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm());
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm(),true);
         //验证钥匙1归还人密码
-        checkPassword(ghr1,form.getGhr1mm());
+        checkPassword(ghr1,form.getGhr1mm(),true);
         //验证钥匙2归还人密码
-        checkPassword(ghr2,form.getGhr2mm());
+        checkPassword(ghr2,form.getGhr2mm(),true);
 
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new SecurityException("参数id不正确");
@@ -139,11 +139,11 @@ public class ZcgServiceImpl extends ServiceImpl<ZcgMapper, Zcg> implements IZcgS
             throw new SecurityException("归还人2不存在");
         }
         //验证接收人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm());
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getJsrmm(),true);
         //验证钥匙1归还人密码
-        checkPassword(ghr1,form.getGhr1mm());
+        checkPassword(ghr1,form.getGhr1mm(),true);
         //验证钥匙2归还人密码
-        checkPassword(ghr2,form.getGhr2mm());
+        checkPassword(ghr2,form.getGhr2mm(),true);
         if (form.getIds().length<0) {
             throw new SecurityException("参数ids不正确");
         }
@@ -189,11 +189,11 @@ public class ZcgServiceImpl extends ServiceImpl<ZcgMapper, Zcg> implements IZcgS
             throw new SecurityException("领取人2不存在");
         }
         //验证发放人密码
-        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getFfrmm());
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getFfrmm(),true);
         //验证钥匙1领取人密码
-        checkPassword(lqr1,form.getLqr1mm());
+        checkPassword(lqr1,form.getLqr1mm(),true);
         //验证钥匙2领取人密码
-        checkPassword(lqr2,form.getLqr2mm());
+        checkPassword(lqr2,form.getLqr2mm(),true);
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new SecurityException("参数id不正确");
         }
@@ -225,11 +225,11 @@ public class ZcgServiceImpl extends ServiceImpl<ZcgMapper, Zcg> implements IZcgS
      * @param user
      * @param qmrmm
      */
-    public void checkPassword(SysUser user,String qmrmm){
+    public void checkPassword(SysUser user,String qmrmm,Boolean needName){
         if(StringUtils.isBlank(qmrmm)){
             throw new ServiceException("签名密码不能为空");
         }
-        sysUserService.checkPassword(user,qmrmm,false);
+        sysUserService.checkPassword(user,qmrmm,needName);
     }
 
 }
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml
index 40c7fec..ff32b93 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml
@@ -5,7 +5,7 @@
 <mapper namespace="com.hxhq.business.mapper.StudyFormFillMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormFillListDto">
         select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.user_id,t.bdzt,t.bdzt,t.tjsj,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
-        ,ss.leader as subjectLeader
+        ,ss.leader as subjectLeader,t.sfbl
         FROM `t_study_form_fill` t
         join t_template tm on tm.id=t.template_id
         join t_study_subject ss on t.study_subject_id=ss.id