Skip to content

Commit 82599b0

Browse files
eryajferyajf
authored andcommitted
fix: 为同步接口添加空数据校验并优化角色更新错误信息
1 parent 18bb5ee commit 82599b0

File tree

5 files changed

+36
-1
lines changed

5 files changed

+36
-1
lines changed

logic/dingtalk_logic.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,11 @@ func (d DingTalkLogic) SyncDingTalkUsers(c *gin.Context, req any) (data any, rsp
114114
common.Log.Errorf("SyncDingTalkUsers: %s", errMsg)
115115
return nil, tools.NewOperationError(errors.New(errMsg))
116116
}
117+
if len(staffs) == 0 {
118+
errMsg := "获取到的用户数量为0"
119+
common.Log.Errorf("SyncDingTalkUsers: %s", errMsg)
120+
return nil, tools.NewOperationError(errors.New(errMsg))
121+
}
117122
// 2.遍历用户,开始写入
118123
for i, staff := range staffs {
119124
// 入库

logic/feishu_logic.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ func (d *FeiShuLogic) SyncFeiShuDepts(c *gin.Context, req any) (data any, rspErr
3333
common.Log.Errorf("SyncFeiShuDepts: %s", errMsg)
3434
return nil, tools.NewOperationError(errors.New(errMsg))
3535
}
36+
if len(depts) == 0 {
37+
errMsg := "获取到的部门数量为0"
38+
common.Log.Errorf("SyncFeiShuDepts: %s", errMsg)
39+
return nil, tools.NewOperationError(errors.New(errMsg))
40+
}
3641

3742
// 2.将远程数据转换成树
3843
deptTree := GroupListToTree(fmt.Sprintf("%s_0", config.Conf.FeiShu.Flag), depts)
@@ -110,6 +115,11 @@ func (d FeiShuLogic) SyncFeiShuUsers(c *gin.Context, req any) (data any, rspErro
110115
common.Log.Errorf("SyncFeiShuUsers: %s", errMsg)
111116
return nil, tools.NewOperationError(errors.New(errMsg))
112117
}
118+
if len(staffs) == 0 {
119+
errMsg := "获取到的用户数量为0"
120+
common.Log.Errorf("SyncFeiShuUsers: %s", errMsg)
121+
return nil, tools.NewOperationError(errors.New(errMsg))
122+
}
113123
// 2.遍历用户,开始写入
114124
for i, staff := range staffs {
115125
// 入库

logic/openldap_logic.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ func (d *OpenLdapLogic) SyncOpenLdapDepts(c *gin.Context, req any) (data any, rs
2525
common.Log.Errorf("SyncOpenLdapDepts: %s", errMsg)
2626
return nil, tools.NewOperationError(errors.New(errMsg))
2727
}
28+
if len(depts) == 0 {
29+
errMsg := "获取到的部门数量为0"
30+
common.Log.Errorf("SyncOpenLdapDepts: %s", errMsg)
31+
return nil, tools.NewOperationError(errors.New(errMsg))
32+
}
2833
groups := make([]*model.Group, 0)
2934
for _, dept := range depts {
3035
groups = append(groups, &model.Group{
@@ -120,6 +125,11 @@ func (d OpenLdapLogic) SyncOpenLdapUsers(c *gin.Context, req any) (data any, rsp
120125
common.Log.Errorf("SyncOpenLdapUsers: %s", errMsg)
121126
return nil, tools.NewOperationError(errors.New(errMsg))
122127
}
128+
if len(staffs) == 0 {
129+
errMsg := "获取到的用户数量为0"
130+
common.Log.Errorf("SyncOpenLdapUsers: %s", errMsg)
131+
return nil, tools.NewOperationError(errors.New(errMsg))
132+
}
123133
// 2.遍历用户,开始写入
124134
for i, staff := range staffs {
125135
groupIds, err := isql.Group.DeptIdsToGroupIds(staff.DepartmentIds)

logic/role_logic.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ func (l RoleLogic) Update(c *gin.Context, req any) (data any, rspError any) {
115115
// 根据path中的角色ID获取该角色信息
116116
roles, _ := isql.Role.GetRolesByIds([]uint{r.ID})
117117
if len(roles) == 0 {
118-
return nil, tools.NewMySqlError(fmt.Errorf("获取角色信息失败: %s", err.Error()))
118+
return nil, tools.NewMySqlError(fmt.Errorf("获取角色信息失败: 未找到对应角色"))
119119
}
120120

121121
if minSort >= roles[0].Sort {

logic/wecom_logic.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,11 @@ func (d *WeComLogic) SyncWeComDepts(c *gin.Context, req any) (data any, rspError
3333
common.Log.Errorf("SyncWeComDepts: %s", errMsg)
3434
return nil, tools.NewOperationError(errors.New(errMsg))
3535
}
36+
if len(depts) == 0 {
37+
errMsg := "获取到的部门数量为0"
38+
common.Log.Errorf("SyncWeComDepts: %s", errMsg)
39+
return nil, tools.NewOperationError(errors.New(errMsg))
40+
}
3641

3742
// 2.将远程数据转换成树
3843
deptTree := GroupListToTree(fmt.Sprintf("%s_1", config.Conf.WeCom.Flag), depts)
@@ -110,6 +115,11 @@ func (d WeComLogic) SyncWeComUsers(c *gin.Context, req any) (data any, rspError
110115
common.Log.Errorf("SyncWeComUsers: %s", errMsg)
111116
return nil, tools.NewOperationError(errors.New(errMsg))
112117
}
118+
if len(staffs) == 0 {
119+
errMsg := "获取到的用户数量为0"
120+
common.Log.Errorf("SyncWeComUsers: %s", errMsg)
121+
return nil, tools.NewOperationError(errors.New(errMsg))
122+
}
113123
// 2.遍历用户,开始写入
114124
for i, staff := range staffs {
115125
// 入库

0 commit comments

Comments
 (0)