From 04a3aa29899d113b8ed8dabf674b054e2b0e8c31 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 04 七月 2024 15:19:15 +0800
Subject: [PATCH] user模块 查全部接口返回userID变id

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
index 6ff9209..064851b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java
@@ -76,7 +76,7 @@
         if(list_users.size() > 0) {
             for(int i = 0; i < list_users.size(); i++) {
                 VoUserInfo voUserInfo = list_users.get(i);
-                String userId = voUserInfo.getUserId();
+                String userId = voUserInfo.getId();
 
                 JSONArray array_roleIds = new JSONArray();
                 List<Map<String, Object>> list_roleIds = Optional.ofNullable(this.dao.getRoleIdsByUserId(Long.parseLong(userId))).orElse(new ArrayList<>());
@@ -113,8 +113,10 @@
      * @return 褰卞搷璁板綍鏁伴噺
      */
     @Transactional
-    public int save(BaUser po){
-        return this.dao.putin(po) ;
+    public Long save(BaUser po){
+        //return this.dao.putin(po) ;
+        this.dao.putin(po) ;
+        return po.getId();
     }
 
     /**
@@ -164,14 +166,15 @@
      * @return 鎻掑叆鐢ㄦ埛涓庤鑹插叧鑱旇褰曟暟閲�
      */
     public int setRoles(Long userId, String[] roleIds) {
-        this.urDao.deleteByUserId(userId);
+
         int count = 0;
         if (roleIds != null && roleIds.length > 0) {
+            this.urDao.deleteByUserId(userId);
             for (String roleId : roleIds) {
                 count += this.urDao.insertSelective(new BaUserRole(userId, Long.parseLong(roleId)));
             }
         }
-        return count;
+        return 1;
     }
 
     /**
@@ -218,7 +221,7 @@
         if(map.size() == 0) {
             return null;
         }
-        voUserInfo.setUserId(String.valueOf(userId));
+        voUserInfo.setId(String.valueOf(userId));
         voUserInfo.setUserName(map.get("userName").toString());
         voUserInfo.setPhone(map.get("phone").toString());
         voUserInfo.setBlockId(map.get("blockId").toString());

--
Gitblit v1.8.0