商家pc端 分权限 第八笔提交

alien-entity/src/main/java/shop/alien/entity/store/StorePlatformUserRole.java

@@ -49,4 +49,10 @@ public class StorePlatformUserRole implements Serializable {
     @TableField("delete_flag")
     @TableLogic(value = "0", delval = "1")
     private Integer deleteFlag;
+
+
+    @ApiModelProperty(value = "删除标志（0未删除 1已删除）")
+    @TableField("account_name")
+    private String accountName;
+
 }

alien-entity/src/main/resources/mapper/StorePlatformUserRoleMapper.xml

@@ -8,7 +8,7 @@
     <select id="querySubAccounts" resultType="shop.alien.entity.store.vo.SubAccountVo">
         SELECT
             sur.id AS userId,
-            COALESCE(sur.name, sur.nick_name) AS accountName,
+            spur.account_name AS accountName,
             sur.phone AS phone,
             spr.role_id AS roleId,
             spr.role_name AS roleName,
@@ -18,11 +18,10 @@
         INNER JOIN store_user sur ON spur.user_id = sur.id
         LEFT JOIN store_platform_role spr ON spur.role_id = spr.role_id
         WHERE spur.store_id = #{storeId}
---           AND sur.account_type = 2
           AND sur.delete_flag = 0
           AND spur.delete_flag = 0
         <if test="accountName != null and accountName != ''">
-            AND (sur.name LIKE CONCAT('%', #{accountName}, '%') OR sur.nick_name LIKE CONCAT('%', #{accountName}, '%'))
+            AND (spur.account_name LIKE CONCAT('%', #{accountName}, '%') )
         </if>
         <if test="phone != null and phone != ''">
             AND sur.phone LIKE CONCAT('%', #{phone}, '%')

alien-store-platform/src/main/java/shop/alien/storeplatform/service/impl/StorePlatformUserRoleServiceImpl.java

@@ -159,6 +159,7 @@ public class StorePlatformUserRoleServiceImpl extends ServiceImpl<StorePlatformU
                 userRole.setRoleId(roleId);
                 userRole.setStoreId(storeId);
                 userRole.setDeleteFlag(0);
+                userRole.setAccountName(accountName);
                 userRole.setCreatedTime(new Date());
                 
                 boolean insertRoleResult = this.save(userRole);
@@ -227,11 +228,11 @@ public class StorePlatformUserRoleServiceImpl extends ServiceImpl<StorePlatformU
             }
             
             // 设置账号名称（优先使用 name，否则使用 nick_name）
-            String accountName = storeUser.getName();
-            if (accountName == null || accountName.isEmpty()) {
-                accountName = storeUser.getNickName();
-            }
-            detailVo.setAccountName(accountName);
+//            String accountName = storeUser.getName();
+//            if (accountName == null || accountName.isEmpty()) {
+//                accountName = storeUser.getNickName();
+//            }
+//            detailVo.setAccountName(accountName);
             detailVo.setPhone(storeUser.getPhone());
 
             // 2. 查询用户角色关联（根据userId和storeId查询）
@@ -244,6 +245,7 @@ public class StorePlatformUserRoleServiceImpl extends ServiceImpl<StorePlatformU
             if (userRole != null && userRole.getRoleId() != null) {
                 Long roleId = userRole.getRoleId();
                 detailVo.setRoleId(roleId);
+                detailVo.setAccountName(userRole.getAccountName());
 
                 // 3. 查询角色信息
                 StorePlatformRole role = storePlatformRoleMapper.selectById(roleId);