作者 tangxvhui

修复bug 部门下的人员

... ... @@ -55,6 +55,7 @@ func addAchievementChance(addData []protocol.AchievementChance, achievementId in
return err
}
//计算剩余的分数
func achievementGraspScoreRemain(graspScore, userGraspScore, providerScoreAll float64) float64 {
return graspScore - userGraspScore - providerScoreAll
}
... ...
... ... @@ -388,8 +388,8 @@ func GetDepartmentUser(companyid int64, departmentid int64) ([]protocol.DepartUs
}
const dataSql string = `SELECT a.user_company_id,b.user_id
FROM user_department AS a
LEFT JOIN user_company AS b ON a.user_company_id = b.id
WHERE a.department_id=? AND b.delete_at=0 AND a.enable_status = 1 `
JOIN user_company AS b ON a.user_company_id = b.id
WHERE a.department_id=? AND b.delete_at=0 AND a.enable_status = 1 AND b.enable = 1 `
err = utils.ExecuteQueryAll(&returnData, dataSql, department.Id)
if err != nil {
... ...