From 530385f0901cb838540bc3f83d573686eb3a3bb4 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期四, 16 五月 2024 17:48:47 +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