From 55cb4daf506ad8f3c637f6e3d9bc7df41e538b2e Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期二, 21 五月 2024 09:14:38 +0800
Subject: [PATCH] 产品和工站导出;不合格原因报废原因添加排序和与产品的关联;

---
 pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
index d3fb7b3..59557e2 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/BaRoleMapper.xml
@@ -117,10 +117,10 @@
     where id = #{id}
   </update>
 
-  <delete id="deleteLogicById" parameterType="java.lang.Long">
+  <update id="deleteLogicById" parameterType="java.lang.Long">
     update ba_role set deleted = 1
     where id = #{id}
-  </delete>
+  </update>
 
   <select id="selectSomeCount" resultType="java.lang.Long">
     select
@@ -167,4 +167,11 @@
       </if>
     </trim>
   </select>
+  <select id="selectAll" resultType="com.dy.pmsGlobal.pojoBa.BaRole">
+    select
+    <include refid="Base_Column_List" />
+    from ba_role
+    where deleted != 1 and disabled !=1
+  </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0