From 99ea8b4fc0d7fdd866797b33c7ce773730d42afa Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 11 六月 2024 15:55:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserSv.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 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..6534304 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
@@ -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;
     }
 
     /**

--
Gitblit v1.8.0