diff --git a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
index 6debdd56..6fe4eded 100644
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/ShopInfoController.java
@@ -9,6 +9,7 @@ import com.czg.account.service.ShopInfoService;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.annotation.SaAdminCheckRole;
 import com.czg.resp.CzgResult;
+import com.czg.sa.StpKit;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.query.QueryWrapper;
 import org.springframework.validation.annotation.Validated;
@@ -42,10 +43,13 @@ public class ShopInfoController {
      * 店铺详情
      * 权限标识: shopInfo:detail
      */
-    @SaAdminCheckPermission("shopInfo:detail")
+//    @SaAdminCheckPermission("shopInfo:detail")
     @GetMapping("/detail")
-    public CzgResult<ShopDetailDTO> detail(Integer id) {
-        return CzgResult.success(shopInfoService.detail(id));
+    public CzgResult<ShopDetailDTO> detail(Long id) {
+        if (StpKit.USER.isAdmin() || StpKit.USER.getShopId().equals(id)) {
+            return CzgResult.success(shopInfoService.detail(id));
+        }
+        return CzgResult.failure("店铺信息不存在");
     }
 
     /**
diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java
index 8bd581bb..a1952085 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/ShopInfoService.java
@@ -16,7 +16,7 @@ public interface ShopInfoService extends IService<ShopInfo> {
 
     Boolean edit(ShopInfoEditDTO shopInfoEditDTO);
 
-    ShopDetailDTO detail(Integer id);
+    ShopDetailDTO detail(Long id);
 
     ShopInfoByCodeDTO getByCode(String tableCode, String lat, String lng, boolean checkState);
 
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
index eec16870..138c1970 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
@@ -131,7 +131,7 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
     }
 
     @Override
-    public ShopDetailDTO detail(Integer id) {
+    public ShopDetailDTO detail(Long id) {
         ShopInfo shopInfo = queryChain().eq(ShopInfo::getId, id == null ? StpKit.USER.getShopId() : id).one();
         if (shopInfo == null) {
             throw new ApiNotPrintException("店铺信息不存在");
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java
index a507adb5..fd8202c9 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopStaffServiceImpl.java
@@ -78,7 +78,7 @@ public class ShopStaffServiceImpl extends ServiceImpl<ShopStaffMapper, ShopStaff
         }
 
         if (StrUtil.isNotBlank(shopStaffEditDTO.getAccountName()) && !shopStaffEditDTO.getAccountName().equals(sysUser.getAccount())) {
-            long count = sysUserService.count(new QueryWrapper().eq(SysUser::getAccount, shopStaffEditDTO.getAccountName()));
+            long count = sysUserService.count(new QueryWrapper().eq(SysUser::getAccount, shopStaffEditDTO.getAccountName()).ne(SysUser::getId, sysUser.getId()));
             if (count > 0) {
                 throw new ApiNotPrintException("此账户名已存在");
             }
diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
index d2414400..433116b9 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
@@ -150,8 +150,6 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
         if (userInfo == null) {
             userInfo = BeanUtil.copyProperties(shopUserAddDTO, UserInfo.class);
             userInfoService.save(userInfo);
-        } else {
-            throw new ApiNotPrintException("此用户已存在");
         }
 
         ShopUser shopUser = BeanUtil.copyProperties(shopUserAddDTO, ShopUser.class);