From c38a400aba3221fdff0bb576d177c1a6a590ecb7 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 08 十二月 2023 11:37:04 +0800
Subject: [PATCH] feat: 设置库管员

---
 consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
index 601ff84..d59f163 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java
@@ -10,12 +10,13 @@
 import com.iplatform.model.po.S_role;
 import com.walker.infrastructure.utils.CollectionUtils;
 import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description 鐗╁搧鍒嗙被
@@ -85,11 +86,17 @@
                 baseWarehouseManager.setManagerName(managerName);
                 this.insert(baseWarehouseManager);
 
-                FinSysTenantUser finSysTenantUser = finSysTenantUserService.queryOneById(String.valueOf(managerId));
+                FinSysTenantUser finSysTenantUser = finSysTenantUserService.queryOneBySysId(String.valueOf(managerId));
                 if (finSysTenantUser == null) {
                     throw new Exception("鐢ㄦ埛涓嶅瓨鍦�");
                 }
                 Long sysUserId = finSysTenantUser.getSysUserId();
+                // 鍏堝垽鏂槸鍚︽嫢鏈夎瑙掕壊
+                String isHasRole = "select count(1) from s_role_user where org_id=0 and role_id=" + roleId + " and user_id=" + sysUserId;
+                List<Map<String, Object>> isHasRoleList = this.select(isHasRole, new HashMap<>());
+                if (!CollectionUtils.isEmpty(isHasRoleList)) {
+                    continue;
+                }
                 String saveUserRole = "insert into s_role_user(user_id, role_id, org_id) values(:managerId,:roleId,0)";
                 Map<String, Object> userRoleParam = new HashMap<>();
                 userRoleParam.put("managerId", sysUserId);
@@ -112,7 +119,7 @@
     @Override
     public List<BaseWarehouseManager> selectManagerList(Long warehouseId, Long agencyId) {
         StringBuilder sql = new StringBuilder("select * from base_warehouse_manager bwm left join base_warehouse bw on bwm.base_warehouse_id = bw.id "
-            + "where 1=1 ");
+                + "where 1=1 ");
         Map<String, Object> param = new HashMap<>();
         if (warehouseId != null) {
             param.put("warehouseId", warehouseId);

--
Gitblit v1.9.1