From d91ac19910eb8008ca8be5a3e30d3d5dcdaa51b8 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Wed, 22 Oct 2025 09:46:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=BF=90=E7=BB=B4=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7-=E5=85=A5=E9=A9=BB=E6=B8=85=E9=99=A4-=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E6=9C=BA=E6=9E=84=201=E3=80=81=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=94=B9=E4=B8=BAopenid+id=20=E7=B2=BE?=
 =?UTF-8?q?=E5=87=86=E5=88=A0=E9=99=A4=E5=AF=B9=E5=BA=94=E9=82=A3=E4=B8=80?=
 =?UTF-8?q?=E6=9D=A1=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=81=BF=E5=85=8D=E8=AF=A5?=
 =?UTF-8?q?openid=E4=B8=8B=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E9=83=BD?=
 =?UTF-8?q?=E8=A2=AB=E6=B8=85=E9=99=A4=202=E3=80=81=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E6=89=80=E6=9C=89=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/CleanAdvisoryMapper.xml              |  5 +----
 .../service/impl/CleanAdvisoryServiceImpl.java      | 13 +++++--------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml
index 6b5473a..987ef6e 100644
--- a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml
+++ b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/mapper/xml/CleanAdvisoryMapper.xml
@@ -17,7 +17,6 @@
             '' as comName
         from nu_biz_advisory_info a inner join nu_employees_advisory_info b on a.open_id = b.open_id
         <where>
-            a.iz_js = '1'
             <if test="params.tel != null and params.tel != ''">
                 AND a.tel = #{params.tel}
             </if>
@@ -41,7 +40,6 @@
             '' as comName
         from nu_biz_advisory_info a inner join nu_employees_advisory_info b on a.open_id = b.open_id
         <where>
-            a.iz_yg = '1'
             <if test="params.tel != null and params.tel != ''">
                 AND a.tel = #{params.tel}
             </if>
@@ -65,7 +63,6 @@
             ifnull(b.com_name,'') as comName
         from nu_biz_advisory_info a inner join nu_org_apply_info b on a.open_id = b.open_id
         <where>
-            a.iz_jg = '1'
             <if test="params.tel != null and params.tel != ''">
                 AND a.tel = #{params.tel}
             </if>
@@ -77,7 +74,7 @@
     </select>
 
     <delete id="deleteOrgApply">
-        delete from nu_org_apply_info where open_id = #{openId}
+        delete from nu_org_apply_info where open_id = #{openId} and id = #{applyId}
     </delete>
 
     <delete id="deleteEmployeesAdvisory">
diff --git a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java
index d4fd5ef..5771fe4 100644
--- a/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java
+++ b/nursing-unit-internaltool/nu-internaltool-biz/src/main/java/com/nu/modules/cleanadvisory/service/impl/CleanAdvisoryServiceImpl.java
@@ -34,7 +34,7 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
     public void clean(CleanAdvisory cleanAdvisory) {
         String advisoryType = cleanAdvisory.getAdvisoryType();
         //清除长者咨询信息
-        if (advisoryType.equals("1")) {
+        if (advisoryType.equals("1") || advisoryType.equals("-1")) {
             cleanAdvisory.setIzJs("0");
             cleanAdvisory.setAdvisoryType("0");
             updateById(cleanAdvisory);
@@ -44,7 +44,7 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
             onlycleanAdvisoryServiceImpl.clearBill(cleanAdvisory);
         }
         //清除员工咨询信息
-        if (advisoryType.equals("2")) {
+        if (advisoryType.equals("2") || advisoryType.equals("-1")) {
             cleanAdvisory.setIzYg("0");
             cleanAdvisory.setAdvisoryType("0");
             updateById(cleanAdvisory);
@@ -54,7 +54,7 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
             onlycleanAdvisoryServiceImpl.clearEmp(cleanAdvisory);
         }
         //清除机构咨询信息
-        if (advisoryType.equals("3")) {
+        if (advisoryType.equals("3") || advisoryType.equals("-1")) {
             cleanAdvisory.setIzJg("0");
             cleanAdvisory.setAdvisoryType("0");
             updateById(cleanAdvisory);
@@ -106,11 +106,8 @@ public class CleanAdvisoryServiceImpl extends ServiceImpl<CleanAdvisoryMapper, C
     @Override
     @DS("ope")
     public void delete(CleanAdvisory cleanAdvisory) {
-        clearBill(cleanAdvisory);
-        baseMapper.deleteEmployeesAdvisory(cleanAdvisory);
-        baseMapper.deleteBizEmployeesOrg(cleanAdvisory);
-        baseMapper.deleteOrgApply(cleanAdvisory);
-        baseMapper.deleteBizAdvisory(cleanAdvisory);
+        cleanAdvisory.setAdvisoryType("-1");
+        onlycleanAdvisoryServiceImpl.clean(cleanAdvisory);
     }
 
 }