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/FinSysTenantUserServiceImpl.java | 22 +++++++++++++++-------
admin-web/src/views/foundation/store/person.vue | 21 +++++++++++++--------
consum-base/src/main/java/com/consum/base/service/impl/BaseWarehouseManagerServiceImpl.java | 17 ++++++++++++-----
3 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/admin-web/src/views/foundation/store/person.vue b/admin-web/src/views/foundation/store/person.vue
index dc647b3..92b0ed7 100644
--- a/admin-web/src/views/foundation/store/person.vue
+++ b/admin-web/src/views/foundation/store/person.vue
@@ -35,7 +35,7 @@
</template>
<script>
-import {userSelectDepartment, warehouseManagerList} from '@/api/foudation/store';
+import {userSelectDepartment, warehouseManagerList, warehouseManagerAdd} from '@/api/foudation/store';
import winMd from '@/components/win/win-md';
import myButton from '@/components/myButton/myButton';
@@ -141,16 +141,21 @@
managerName: item.name,
});
});
- setTimeout(()=>{
- this.$message.success('淇濆瓨鎴愬姛锛�');
- this.close();
- this.$emit('search');
- },6000)
- // warehouseManagerAdd(params).then((res) => {
+ // setTimeout(()=>{
+ // warehouseManagerAdd(params).then((res) => {
+ // this.$message.success('淇濆瓨鎴愬姛锛�');
+ // this.close();
+ // this.$emit('search');
+ // });
// this.$message.success('淇濆瓨鎴愬姛锛�');
// this.close();
// this.$emit('search');
- // });
+ // },6000)
+ warehouseManagerAdd(params).then((res) => {
+ this.$message.success('淇濆瓨鎴愬姛锛�');
+ this.close();
+ this.$emit('search');
+ });
},
},
};
diff --git a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java
index 1f1557a..cb746a6 100644
--- a/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/FinSysTenantUserServiceImpl.java
@@ -1,12 +1,5 @@
package com.consum.base.service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.stereotype.Service;
-
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.model.po.FinSysTenantUser;
import com.iplatform.base.util.PlatformRSAUtils;
@@ -16,6 +9,12 @@
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Service
public class FinSysTenantUserServiceImpl extends BaseServiceImpl {
@@ -128,6 +127,15 @@
}
return null;
}
+ public FinSysTenantUser queryOneBySysId(String sysUserId) {
+ FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
+ finSysTenantUser.setSysUserId(Long.valueOf(sysUserId));
+ List<FinSysTenantUser> finSysTenantUserList = this.select(finSysTenantUser);
+ if (!StringUtils.isEmptyList(finSysTenantUserList)) {
+ return finSysTenantUserList.get(0);
+ }
+ return null;
+ }
public FinSysTenantUser queryOneByUserId(String userId) {
List<FinSysTenantUser> finSysTenantUserList =
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