From 7d2e66989667e7652c7ee4f6e1c13f57f353f5e4 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 13 Aug 2024 08:59:10 +0800
Subject: [PATCH] system-api

---
 .../bonus/sgzb/system/api/domain/SysDept.java | 23 ++++++++++++++++++-
 .../bonus/sgzb/system/api/domain/SysRole.java | 12 ++++++++++
 .../factory/RemoteUserFallbackFactory.java    |  4 ++--
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java
index 41f9856..43a2f77 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysDept.java
@@ -67,11 +67,32 @@ public class SysDept extends BaseEntity
     
     /** 子部门 */
     @ApiModelProperty(value = "子部门")
-    private List<SysDept> children = new ArrayList<SysDept>();
+    private List<SysDept> children = new ArrayList<>();
 
     /** 备注信息 */
     private String remark;
 
+    /** 所属组织id */
+    private Long companyId;
+
+    @Override
+    public String getRemark() {
+        return remark;
+    }
+
+    @Override
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
     public Long getDeptId()
     {
         return deptId;
diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysRole.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysRole.java
index 2638a34..8a7d1d7 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysRole.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/domain/SysRole.java
@@ -78,6 +78,17 @@ public class SysRole extends BaseEntity
     /** 数据所属组织 */
     private String deptName;
 
+    /** 所属组织id */
+    private Long companyId;
+
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
     public SysRole()
     {
 
@@ -259,6 +270,7 @@ public class SysRole extends BaseEntity
             .append("updateTime", getUpdateTime())
             .append("remark", getRemark())
             .append("deptName", getDeptName())
+            .append("companyId", getCompanyId())
             .toString();
     }
 }
diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java
index 82107f9..07ae764 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/system/api/factory/RemoteUserFallbackFactory.java
@@ -34,7 +34,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
 
             @Override
             public R<LoginUser> getUserInfoByPhone(String phone, String source) {
-                return R.fail("获取用户失败:" + throwable.getMessage());
+                return R.fail("根据手机号获取用户失败:" + throwable.getMessage());
             }
 
             @Override
@@ -59,7 +59,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
 
             @Override
             public R<List<SysUser>> getUserList(SysUser sysUser, String source) {
-                return R.fail("获取用户失败:" + throwable.getMessage());
+                return R.fail("获取用户列表失败:" + throwable.getMessage());
             }
         };
     }