From 0b091eee12e72b405eb85fdfa134842546db2745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 26 Jul 2024 14:32:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=91=98=E8=A1=A8=E8=BE=BE=E5=BC=8F?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auth/param/AuthMemberSaveParam.java       |  2 +-
 .../salary/entity/auth/po/AuthMemberPO.java   |  6 ++---
 .../salary/mapper/auth/AuthMemberMapper.xml   | 22 +++++++++----------
 .../service/auth/AuthMemberServiceImpl.java   |  6 +++--
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java b/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java
index feb0d2fde..f6ef3815f 100644
--- a/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java
+++ b/src/com/engine/salary/entity/auth/param/AuthMemberSaveParam.java
@@ -16,7 +16,7 @@ public class AuthMemberSaveParam {
 
     private Integer targetType;
 
-    private String targetId;
+    private String target;
 
     private String targetName;
 }
\ No newline at end of file
diff --git a/src/com/engine/salary/entity/auth/po/AuthMemberPO.java b/src/com/engine/salary/entity/auth/po/AuthMemberPO.java
index a0c7b4a6d..218c1b3ae 100644
--- a/src/com/engine/salary/entity/auth/po/AuthMemberPO.java
+++ b/src/com/engine/salary/entity/auth/po/AuthMemberPO.java
@@ -30,10 +30,10 @@ public class AuthMemberPO {
     @ElogTransform( name="对象类型" )
     private Integer targetType;
     /**
-     * 对象id
+     * 对象
      */
-    @ElogTransform( name="对象id" )
-    private String targetId;
+    @ElogTransform( name="对象" )
+    private String target;
     /**
      * 对象
      */
diff --git a/src/com/engine/salary/mapper/auth/AuthMemberMapper.xml b/src/com/engine/salary/mapper/auth/AuthMemberMapper.xml
index c9ea254ce..8bde81000 100644
--- a/src/com/engine/salary/mapper/auth/AuthMemberMapper.xml
+++ b/src/com/engine/salary/mapper/auth/AuthMemberMapper.xml
@@ -5,7 +5,7 @@
         <result column="id" property="id" />
         <result column="role_id" property="roleId" />
         <result column="target_type" property="targetType" />
-        <result column="target_id" property="targetId" />
+        <result column="target" property="target" />
         <result column="target_name" property="targetName" />
         <result column="creator" property="creator" />
         <result column="create_time" property="createTime" />
@@ -19,7 +19,7 @@
         t.id
         , t.role_id
         , t.target_type
-        , t.target_id
+        , t.target
         , t.target_name
         , t.creator
         , t.create_time
@@ -59,8 +59,8 @@
         <if test="targetType != null">
             AND target_type = #{targetType}
         </if>
-        <if test="targetId != null">
-            AND target_id = #{targetId}
+        <if test="target != null">
+            AND target = #{target}
         </if>
         <if test="targetName != null">
             AND target_name = #{targetName}
@@ -104,8 +104,8 @@
             <if test="targetType != null">
                 target_type,
             </if>
-            <if test="targetId != null">
-                target_id,
+            <if test="target != null">
+                target,
             </if>
             <if test="targetName != null">
                 target_name,
@@ -136,8 +136,8 @@
             <if test="targetType != null" >
                 #{targetType},
             </if>
-            <if test="targetId != null" >
-                #{targetId},
+            <if test="target != null" >
+                #{target},
             </if>
             <if test="targetName != null" >
                 #{targetName},
@@ -166,7 +166,7 @@
         <set>
             role_id=#{roleId},
             target_type=#{targetType},
-            target_id=#{targetId},
+            target=#{target},
             target_name=#{targetName},
             creator=#{creator},
             create_time=#{createTime},
@@ -188,8 +188,8 @@
             <if test="targetType != null" >
                 target_type=#{targetType},
             </if>
-            <if test="targetId != null" >
-                target_id=#{targetId},
+            <if test="target != null" >
+                target=#{target},
             </if>
             <if test="targetName != null" >
                 target_name=#{targetName},
diff --git a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java
index 8a15ea290..37b3bf70b 100644
--- a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java
+++ b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java
@@ -57,7 +57,7 @@ public class AuthMemberServiceImpl extends Service implements AuthMemberService
         Date now = new Date();
         AuthMemberPO po = AuthMemberPO.builder()
                 .id(IdGenerator.generate())
-                .targetId(param.getTargetId())
+                .target(param.getTarget())
                 .targetType(param.getTargetType())
                 .targetName(param.getTargetName())
                 .creator((long) user.getUID())
@@ -113,7 +113,9 @@ public class AuthMemberServiceImpl extends Service implements AuthMemberService
         //1、获取成员
         List<AuthMemberPO> members = getAuthMemberMapper().listSome(AuthMemberPO.builder().roleId(roleId).build());
         for (AuthMemberPO member : members) {
-            member.getTargetId();
+
+
+            String targetId = member.getTarget();
 
 
         }