From a3202d4c62be404247d23f0676e95f8c5d146983 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期六, 06 七月 2024 09:49:17 +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