From 02a346b1b78c8d2b6b3c298ed2fb8feea8ef96ee Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 31 十二月 2025 15:49:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
index 64ca017..d54f642 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -2,6 +2,8 @@
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.controller.dto.UserDTO;
@@ -143,7 +145,12 @@
userDTO.setPass(null);
userDTO.setId(user.getId());
userDTO.setUserName(user.getUserName());
- userDTO.setAddress(user.getAddress());
+ List<String> list = JSON.parseObject(user.getAddress(), new TypeReference<List<String>>() {});
+ if(list!=null && list.size()==1){
+ userDTO.setAddress(list.get(0));
+ }else{
+ userDTO.setAddress(list);
+ }
userDTO.setToken(StpUtil.getTokenValue());
Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));
@@ -198,8 +205,12 @@
return map;
}
- public Boolean updateProcessSv(Integer id, String process) {
- return userMapper.updateProcessMp(id,process);
+ public Boolean updateProcessSv(Integer id, Map<String, String> process) {
+ String processList=null;
+ if(!Objects.equals(process.get("processList"), "")){
+ processList=process.get("processList");
+ }
+ return userMapper.updateProcessMp(id, processList);
}
public Object findByAddress(Map<String,String> userName) {
--
Gitblit v1.8.0