From 2d02dee9812ff906c0a5db97a5d04154bf54fa3f Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 13 十二月 2023 17:39:58 +0800
Subject: [PATCH] 修改用户角色关联
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 48 +++++++++++++++++-------------------------------
1 files changed, 17 insertions(+), 31 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index 25d05a3..7ee165a 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -12,7 +12,6 @@
import java.util.Set;
import org.apache.commons.compress.utils.Lists;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
@@ -29,6 +28,7 @@
import com.consum.base.BaseController;
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapperUtil;
+import com.consum.base.core.utils.PageUtil;
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.base.pojo.FinSysTenantUserUpdParam;
import com.consum.base.pojo.ImportUserParam;
@@ -51,7 +51,6 @@
import com.iplatform.model.po.S_dept;
import com.iplatform.model.po.S_role;
import com.iplatform.model.po.S_user_core;
-import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.NumberGenerator;
@@ -59,7 +58,6 @@
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
-import cn.hutool.core.util.ReflectUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -119,32 +117,20 @@
param.setTenantCode(Long.valueOf(finSysTenant.getCode()));
}
}
- GenericPager<FinSysTenantUser> pager = this.finSysTenantUserService.queryAllPageUser(param);
-
- List<FinSysTenantUserVO> resultList = new ArrayList<>();
- for (FinSysTenantUser finSysTenantUser : pager.getDatas()) {
- FinSysTenantUserVO userVO = new FinSysTenantUserVO();
+ PageUtil<FinSysTenantUserVO> pager = this.finSysTenantUserService.queryAllPageUser(param);
+ for (FinSysTenantUserVO finSysTenantUser : pager.getDatas()) {
String tel = finSysTenantUser.getUserPhone() != null
? AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY) : null;
finSysTenantUser.setUserPhone(StringUtils.isNotEmpty(tel) ? PhoneNumberUtils.maskMobile(tel) : "");
- List<S_role> list = finSysTenantUserService.getByUserId(finSysTenantUser.getSysUserId());
+ // 鍒楄〃涓嶉渶瑕佹煡璇㈣鑹诧紝鍙樉绀哄垪琛ㄦ墍闇�瑕佺殑淇℃伅
+ /*List<S_role> list = finSysTenantUserService.getByUserId(finSysTenantUser.getSysUserId());
StringBuilder roleStr = new StringBuilder();
list.forEach(s_role -> roleStr.append(s_role.getRole_name()).append(" "));
finSysTenantUser.setRoleStr(roleStr.toString());
+ finSysTenantUser.setIsSupplier(finSysTenantUser.getSupplierId() != null ? "鏄�" : "鍚�");*/
- finSysTenantUser.setIsSupplier(finSysTenantUser.getSupplierId() != null ? "鏄�" : "鍚�");
-
- BeanUtils.copyProperties(finSysTenantUser, userVO);
- FinSysTenantDepartment department = finSysTenantDepartmentService.getById(finSysTenantUser.getSysDeptId());
- if (Objects.nonNull(department)) {
- userVO.setSysDeptName(department.getName());
- }
- resultList.add(userVO);
}
-
- ReflectUtil.setFieldValue(pager, "datas", resultList);
-
return ResponseValue.success(pager);
}
@@ -450,14 +436,14 @@
// 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
// 宸叉湁鐨勬潈闄�
Long sysUserId = user.getSysUserId();
- List<S_role> list = finSysTenantUserService.getByUserId(sysUserId);
+ List<S_role> list = finSysTenantUserService.getRoleBySysUserId(sysUserId);
// 閫夋嫨鐨勬潈闄�
List<Long> roleList = user.getRoleList();
// 鍏堝垹闄ゅ啀娣诲姞
- if (list != null && list.size() > 0) {
+ if (!CollectionUtils.isEmpty(list)) {
finSysTenantUserService.execDelRoleUserList(sysUserId);
}
- if (roleList != null && roleList.size() > 0) {
+ if (!CollectionUtils.isEmpty(roleList)) {
finSysTenantUserService.execInsertRoleUserList(roleList, sysUserId);
}
this.getFinSysTenantUserCache().remove(sysUserId.toString());
@@ -558,13 +544,12 @@
if (finSysTenantUser == null) {
return ResponseValue.error("鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- String s = AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY);
-
- finSysTenantUser.setUserPhone(s);
+ String phone = AESUtils.decryptStrAES(finSysTenantUser.getUserPhone(), PlatformRSAUtils.AES_KEY);
+ finSysTenantUser.setUserPhone(phone);
Long sysUserId = finSysTenantUser.getSysUserId();
- List<S_role> list = finSysTenantUserService.getByUserId(sysUserId);
+ List<S_role> roleList = finSysTenantUserService.getRoleBySysUserId(sysUserId);
HashMap<String, Object> map = new HashMap<>();
- map.put("list", list);
+ map.put("list", roleList);
map.put("data", finSysTenantUser);
return ResponseValue.success(map);
}
@@ -587,10 +572,11 @@
sysInfo.setUserPhone(AESUtils.decryptStrAES(userPhone, key));
}
- // 鏌ヨ 鐢ㄦ埛瑙掕壊 TODO 涓存椂瑙ｅ喅 灏嗘潵鏀鹃厤缃枃浠朵腑
+ // 鏌ヨ 鐢ㄦ埛瑙掕壊
// 宸叉湁鐨勬潈闄�
- List<S_role> list = finSysTenantUserService.getByUserId(sysInfo.getSysUserId());
+ List<S_role> list = finSysTenantUserService.getRoleBySysUserId(sysInfo.getSysUserId());
for (S_role s_role : list) {
+ // TODO 涓存椂瑙ｅ喅 灏嗘潵鏀鹃厤缃枃浠朵腑
if (s_role.getRole_id() != null && s_role.getRole_id().equals(1690961420053L)) {
sysInfo.setKfStatus(1);
}
@@ -633,7 +619,7 @@
}
// 1. 鏍规嵁 user.getSysUserId() 鏌ヨ
// 宸叉湁鐨勬潈闄�
- List<S_role> list = finSysTenantUserService.getByUserId(user.getSysUserId());
+ List<S_role> list = finSysTenantUserService.getRoleBySysUserId(user.getSysUserId());
// 閫夋嫨鐨勬潈闄�
List<Long> roleList = user.getRoleList();
// 鍏堝垹闄ゅ啀娣诲姞
--
Gitblit v1.9.1